diff --git a/acl/acl-mongodbBackend-tests.ts b/acl/acl-mongodbBackend-tests.ts
index 31411b65c78e49..01c9af90823425 100644
--- a/acl/acl-mongodbBackend-tests.ts
+++ b/acl/acl-mongodbBackend-tests.ts
@@ -1,4 +1,4 @@
-///
+///
// https://github.com/OptimalBits/node_acl/blob/master/Readme.md
import Acl = require('acl');
@@ -14,4 +14,3 @@ acl.allow('guest', 'blogs', 'view');
// allow function accepts arrays as any parameter
acl.allow('member', 'blogs', ['edit','view', 'delete']);
-
diff --git a/acl/acl-mongodbBackend.d.ts b/acl/acl-mongodbBackend.d.ts
deleted file mode 100644
index 8dbfb7e9059930..00000000000000
--- a/acl/acl-mongodbBackend.d.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-// Type definitions for node_acl 0.4.7
-// Project: https://github.com/optimalbits/node_acl
-// Definitions by: Qubo
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-///
-///
-
-declare module "acl" {
- import mongo = require('mongodb');
-
- interface AclStatic {
- mongodbBackend: MongodbBackendStatic;
- }
-
- interface MongodbBackend extends Backend { }
- interface MongodbBackendStatic {
- new(db: mongo.Db, prefix: string, useSingle: boolean): MongodbBackend;
- new(db: mongo.Db, prefix: string): MongodbBackend;
- new(db: mongo.Db): MongodbBackend;
- }
-}
diff --git a/acl/acl-redisBackend-test.ts b/acl/acl-redisBackend-test.ts
index e1bf29af497b72..273aeab3b74b56 100644
--- a/acl/acl-redisBackend-test.ts
+++ b/acl/acl-redisBackend-test.ts
@@ -1,4 +1,4 @@
-///
+///
// https://github.com/OptimalBits/node_acl/blob/master/Readme.md
import Acl = require('acl');
diff --git a/acl/acl-redisBackend.d.ts b/acl/acl-redisBackend.d.ts
deleted file mode 100644
index e199f8b81cbda8..00000000000000
--- a/acl/acl-redisBackend.d.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-// Type definitions for node_acl 0.4.7
-// Project: https://github.com/optimalbits/node_acl
-// Definitions by: Qubo
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-///
-///
-
-declare module "acl" {
- import redis = require('redis');
-
- interface AclStatic {
- redisBackend: RedisBackendStatic;
- }
-
- interface RedisBackend extends Backend { }
- interface RedisBackendStatic {
- new(redis: redis.RedisClient, prefix: string): RedisBackend;
- new(redis: redis.RedisClient): RedisBackend;
- }
-}
diff --git a/acl/acl.d.ts b/acl/acl.d.ts
index 5d0498fed9115f..57e85d9d584a63 100644
--- a/acl/acl.d.ts
+++ b/acl/acl.d.ts
@@ -6,6 +6,9 @@
///
///
+///
+///
+
declare module "acl" {
import http = require('http');
import Promise = require("bluebird");
@@ -115,6 +118,33 @@ declare module "acl" {
end: () => void;
}
+ // for redis backend
+ import redis = require('redis');
+
+ interface AclStatic {
+ redisBackend: RedisBackendStatic;
+ }
+
+ interface RedisBackend extends Backend { }
+ interface RedisBackendStatic {
+ new(redis: redis.RedisClient, prefix: string): RedisBackend;
+ new(redis: redis.RedisClient): RedisBackend;
+ }
+
+ // for mongodb backend
+ import mongo = require('mongodb');
+
+ interface AclStatic {
+ mongodbBackend: MongodbBackendStatic;
+ }
+
+ interface MongodbBackend extends Backend { }
+ interface MongodbBackendStatic {
+ new(db: mongo.Db, prefix: string, useSingle: boolean): MongodbBackend;
+ new(db: mongo.Db, prefix: string): MongodbBackend;
+ new(db: mongo.Db): MongodbBackend;
+ }
+
var _: AclStatic;
export = _;
}