Merge branch 'frontend-next' into t216-refactor-common

2017-01-15 11:33:22 +08:00
parent 0f833f099f 3d6b319216
commit c0e8306961
18 changed files with 306 additions and 69 deletions
--- a/config.json.example
+++ b/config.json.example
@@ -53,6 +53,18 @@
            "clientSecret": "change this",
            "apiKey": "change this"
        },
+        "ldap": {
+            "url": "ldap://change_this",
+            "bindDn": null,
+            "bindCredentials": null,
+            "tokenSecret": "change this",
+            "searchBase": "change this",
+            "searchFilter": "change this",
+            "searchAttributes": "change this",
+            "tlsOptions": {
+                "changeme": "See https://nodejs.org/api/tls.html#tls_tls_connect_options_callback"
+            }
+        },
        "imgur": {
            "clientID": "change this"
        }