Merge pull request 'Gracefully fail config build when master secret not available' (#5 ) from bugfix/config_without_master_key into master

Reviewed-on: #5
Gracefully fail config build when master secret not available
2020-11-21 15:28:55 +00:00 · 2020-11-21 16:22:11 +01:00
2 changed files with 5 additions and 5 deletions
--- a/config/database.yml
+++ b/config/database.yml
@@ -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 %>
--- a/config/ldap.yml
+++ b/config/ldap.yml
@@ -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
Author	SHA1	Message	Date
raucao	e855e3cf61	Merge pull request 'Gracefully fail config build when master secret not available' (#5 ) from bugfix/config_without_master_key into master All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #5	2020-11-21 15:28:55 +00:00
Sebastian Kippe	91c3f8da2d	Gracefully fail config build when master secret not available All checks were successful continuous-integration/drone/pr Build is passing Details continuous-integration/drone/push Build is passing Details When the credentials are not accessible, e.g. on CI, parsing the database config fails otherwise.	2020-11-21 16:22:11 +01:00