Skip to content
This repository has been archived by the owner on Jan 5, 2019. It is now read-only.

Commit

Permalink
properly render the values from secrets.yml in config files (#1384)
Browse files Browse the repository at this point in the history
  • Loading branch information
weiweishi authored Aug 4, 2017
1 parent 4e1cba8 commit 515b164
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 16 deletions.
10 changes: 5 additions & 5 deletions config/analytics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
# privkey_secret: GOOGLE_OAUTH_PRIVATE_KEY_SECRET
# client_email: GOOGLE_OAUTH_CLIENT_EMAIL
analytics:
app_name: Rails.application.secrets.ga_app_name
app_version: Rails.application.secrets.ga_app_version
privkey_path: Rails.application.secrets.ga_privkey_path
privkey_secret: Rails.application.secrets.ga_privkey_secret
client_email: Rails.application.secrets.ga_email
app_name: <%= Rails.application.secrets.ga_app_name %>
app_version: <%= Rails.application.secrets.ga_app_version %>
privkey_path: <%= Rails.application.secrets.ga_privkey_path %>
privkey_secret: <%= Rails.application.secrets.ga_privkey_secret %>
client_email: <%= Rails.application.secrets.ga_email %>
4 changes: 2 additions & 2 deletions config/blacklight.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
default: &default
adapter: Rails.application.secrets.blacklight_adapter
url: Rails.application.secrets.solr_url
adapter: <%= Rails.application.secrets.blacklight_adapter %>
url: <%= Rails.application.secrets.solr_url %>
development:
<<: *default
test:
Expand Down
4 changes: 2 additions & 2 deletions config/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,6 @@ test:
# url: <%= ENV['DATABASE_URL'] %>
#
staging:
url: Rails.application.secrets.database_url
url: <%= Rails.application.secrets.database_url %>
production:
url: Rails.application.secrets.database_url
url: <%= Rails.application.secrets.database_url %>
8 changes: 4 additions & 4 deletions config/fedora.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
default: &default
user: Rails.application.secrets.fedora_user
password: Rails.application.secrets.fedora_password
url: Rails.application.secrets.fedora_url
base_path: Rails.application.secrets.fedora_basepath
user: <%= Rails.application.secrets.fedora_user %>
password: <%= Rails.application.secrets.fedora_password %>
url: <%= Rails.application.secrets.fedora_url %>
base_path: <%= Rails.application.secrets.fedora_basepath %>
development:
<<: *default
test:
Expand Down
2 changes: 1 addition & 1 deletion config/redis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
default: &default
url: Rails.application.secrets.redis_url
url: <%= Rails.application.secrets.redis_url %>

# environment variable REDIS_URL can be configured to contain all information needed to connect to redis server
# e.g. redis://:[email protected]:6380/15, which include the URL, username/password as required, port number, db etc
Expand Down
2 changes: 1 addition & 1 deletion config/resque-pool.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"*": Rails.application.secrets.resque_workers
"*": <%= Rails.application.secrets.resque_workers %>
2 changes: 1 addition & 1 deletion config/solr.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
default: &default
url: Rails.application.secrets.solr_url
url: <%= Rails.application.secrets.solr_url %>
development:
<<: *default
test:
Expand Down

0 comments on commit 515b164

Please sign in to comment.