diff options
| author | Azul <azul@leap.se> | 2012-12-20 16:23:10 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2012-12-20 16:23:10 +0100 |
| commit | c4f87b3447ab2a96dc9181d0b89be4f6f025042a (patch) | |
| tree | e1dd47e6117e462d429efb270ecafeddc6fba9ea /config | |
| parent | bbfdf2df83c0469b0e4a84b76df072179fe1f0d6 (diff) | |
| parent | 54037816896a9347c5894ad8260e440bba43d14f (diff) | |
Merge branch 'feature/use-default-config-file' into feature/validate-email-domain
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.yml.example | 8 | ||||
| -rw-r--r-- | config/defaults.yml (renamed from config/config.yml) | 3 | ||||
| -rw-r--r-- | config/initializers/load_config.rb | 8 |
3 files changed, 10 insertions, 9 deletions
diff --git a/config/config.yml.example b/config/config.yml.example deleted file mode 100644 index c34dd10..0000000 --- a/config/config.yml.example +++ /dev/null @@ -1,8 +0,0 @@ -development: - admins: [admin, admin2] - -test: - admins: [admin, admin2] - -production: - admins: [] diff --git a/config/config.yml b/config/defaults.yml index c34dd10..4ffa2c9 100644 --- a/config/config.yml +++ b/config/defaults.yml @@ -1,8 +1,11 @@ development: admins: [admin, admin2] + domain: develop.me test: admins: [admin, admin2] + domain: test.me production: admins: [] + domain: deploy.me diff --git a/config/initializers/load_config.rb b/config/initializers/load_config.rb index e687429..a3dbc5f 100644 --- a/config/initializers/load_config.rb +++ b/config/initializers/load_config.rb @@ -1 +1,7 @@ -APP_CONFIG = YAML.load_file("#{Rails.root}/config/config.yml")[Rails.env] +def load_config_file(file) + File.exists?(file) ? YAML.load_file(file)[Rails.env] : {} +end + +defaults = load_config_file("#{Rails.root}/config/defaults.yml") +config = load_config_file("#{Rails.root}/config/config.yml") +APP_CONFIG = defaults.merge(config).with_indifferent_access |