diff options
| author | Houssam Haidar <houssam@sdelements.com> | 2015-02-22 23:43:41 -0600 |
|---|---|---|
| committer | Houssam Haidar <houssam@sdelements.com> | 2015-02-22 23:43:41 -0600 |
| commit | 89dd988b1d820ab5d23d2108c89a89b11d9718d6 (patch) | |
| tree | e033f41b8f5d4dc8fef21ea7fcbd330a88fc35a8 | |
| parent | 41d2a3720b363c4d177f69d6e59d48fa541e08d7 (diff) | |
| parent | 933a224746bdd63672b769cc5ccaa45b0ff1dee9 (diff) | |
| download | lets-chat-89dd988b1d820ab5d23d2108c89a89b11d9718d6.zip lets-chat-89dd988b1d820ab5d23d2108c89a89b11d9718d6.tar.gz lets-chat-89dd988b1d820ab5d23d2108c89a89b11d9718d6.tar.bz2 | |
Merge branch 'master' of github.com:sdelements/lets-chat
| -rw-r--r-- | defaults.yml | 3 | ||||
| -rw-r--r-- | settings.yml.sample | 12 |
2 files changed, 1 insertions, 14 deletions
diff --git a/defaults.yml b/defaults.yml index 0aba650..c707a62 100644 --- a/defaults.yml +++ b/defaults.yml @@ -44,7 +44,6 @@ files: - 'image/jpeg' - 'image/png' - 'image/gif' - local: dir: uploads @@ -52,9 +51,7 @@ auth: throttling: enable: true threshold: 3 - providers: [local] # [local, kerberos, ldap] - You can specify the order - local: enableRegistration: true passwordRegex: ^.{8,64}$ diff --git a/settings.yml.sample b/settings.yml.sample index 31f08c6..8611313 100644 --- a/settings.yml.sample +++ b/settings.yml.sample @@ -4,7 +4,7 @@ # See defaults.yml for all available options # -env: development # development / production +env: production # development / production http: enable: true @@ -34,18 +34,8 @@ database: secrets: cookie: secretsauce - local: - dir: uploads - - s3: - accessKeyId: - secretAccessKey: - bucket: - region: - auth: providers: [local] - local: enableRegistration: true salt: secretsauce # Required when upgrading from version < 0.3 |