diff options
| author | Azul <azul@leap.se> | 2013-03-05 13:35:05 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2013-03-05 13:35:05 +0100 |
| commit | 27c16ccceffa1d8eaaf02612cf29a60bfe6ced01 (patch) | |
| tree | 1df9d9900872cf2e97d5c27b4175816eff5cbf80 /config/defaults.yml | |
| parent | 733426aa3992dafaf1c58ede7e74018057a01148 (diff) | |
| parent | 87c306ea212c01ecc8f98009def5971fc4d5af11 (diff) | |
Merge branch 'master' into feature/limit_user_leak
Conflicts:
users/lib/warden/strategies/secure_remote_password.rb
Diffstat (limited to 'config/defaults.yml')
| -rw-r--r-- | config/defaults.yml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/config/defaults.yml b/config/defaults.yml index 54e4178..d0fb52f 100644 --- a/config/defaults.yml +++ b/config/defaults.yml @@ -8,7 +8,7 @@ cert_options: &cert_options client_cert_bit_size: 2024 client_cert_hash: "SHA256" free_certs_enabled: true - free_cert_postfix: "*Free Cert*" + free_cert_prefix: "FREE" development: <<: *dev_ca @@ -21,7 +21,6 @@ test: <<: *cert_options admins: [admin, admin2] domain: test.me - production: <<: *cert_options |