kosmos/akkounts
kosmos
/
akkounts
8
1
Fork 0
Code Issues 21 Pull Requests 1 Actions Packages Releases 11 Activity

Merge pull request 'Gracefully fail config build when master secret not available' (#5) from bugfix/config_without_master_key into master
continuous-integration/drone/push Build is passing Details 

Reviewed-on: #5
This commit is contained in:
Râu Cao 2020-11-21 15:28:55 +00:00
parent 8bd69b2adb 91c3f8da2d
commit e855e3cf61
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/database.yml
View File

@ -25,6 +25,6 @@ production:
adapter: postgresql
database: akkounts
port: 5432
host: <%= Rails.application.credentials.postgres[:host] %>
username: <%= Rails.application.credentials.postgres[:username] %>
password: <%= Rails.application.credentials.postgres[:password] %>
host: <%= Rails.application.credentials.postgres[:host] rescue nil %>
username: <%= Rails.application.credentials.postgres[:username] rescue nil %>
password: <%= Rails.application.credentials.postgres[:password] rescue nil %>

4
config/ldap.yml
View File

@ -50,7 +50,7 @@ production:
port: 636
attribute: cn
base: ou=kosmos.org,cn=users,dc=kosmos,dc=org
admin_user: <%= Rails.application.credentials.ldap[:username] %>
admin_password: <%= Rails.application.credentials.ldap[:password] %>
admin_user: <%= Rails.application.credentials.ldap[:username] rescue nil %>
admin_password: <%= Rails.application.credentials.ldap[:password] rescue nil %>
ssl: simple_tls
# <<: *AUTHORIZATIONS