Skip to content

Commit 632f391

Browse files
committed
extract secrets from settings.yml
1 parent dc3e3a8 commit 632f391

File tree

3 files changed

+22
-23
lines changed

3 files changed

+22
-23
lines changed

config/secrets.yml.template

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,24 @@ test:
77
production:
88
secret_key_base: ~
99
rollbar: ~
10+
11+
# You should change this if you want to be able to access the API
12+
api:
13+
basic_auth_name: <%= SecureRandom.hex %>
14+
basic_auth_password: <%= SecureRandom.hex %>
15+
16+
# You should change this if you want to be able to access the SecureRooms API
17+
secure_rooms_api:
18+
basic_auth_name: <%= SecureRandom.hex %>
19+
basic_auth_password: <%= SecureRandom.hex %>
20+
21+
# Uncomment these lines if you wish to use S3 in your application.
22+
# paperclip:
23+
# storage: fog
24+
# fog_credentials:
25+
# provider: AWS
26+
# aws_access_key_id: Your-Key-Here
27+
# aws_secret_access_key: Your-Key-Here
28+
# fog_directory: Your-Bucket-Name-Here
29+
# fog_public: false
30+
# path: ":class/:attachment/:id_partition/:style/:safe_filename"

config/settings.local.yml.template

Lines changed: 0 additions & 12 deletions
This file was deleted.

config/settings.yml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -86,16 +86,6 @@ relays:
8686
admin_enabled: true
8787
reservation_enabled: true
8888

89-
# You should change this if you want to be able to access the API
90-
api:
91-
basic_auth_name: <%= SecureRandom.hex %>
92-
basic_auth_password: <%= SecureRandom.hex %>
93-
94-
# You should change this if you want to be able to access the SecureRooms API
95-
secure_rooms_api:
96-
basic_auth_name: <%= SecureRandom.hex %>
97-
basic_auth_password: <%= SecureRandom.hex %>
98-
9989
#
10090
# For these settings use SettingsHelper#feature_on?
10191
feature:
@@ -135,7 +125,7 @@ split_accounts:
135125
- administrator
136126
# - account_manager
137127

138-
# This may be overridden in settings.local.yml if your fork is using S3, so
128+
# This may be overridden in secrets.yml if your fork is using S3, so
139129
# be sure to check there for configuration
140130
paperclip:
141131
storage: filesystem

0 commit comments

Comments
 (0)