From 91c3f8da2d4cbd95e88c52a73a259b2502828f34 Mon Sep 17 00:00:00 2001 From: Sebastian Kippe Date: Sat, 21 Nov 2020 16:22:11 +0100 Subject: [PATCH] Gracefully fail config build when master secret not available When the credentials are not accessible, e.g. on CI, parsing the database config fails otherwise. --- config/database.yml | 6 +++--- config/ldap.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/database.yml b/config/database.yml index 175f795..10df6c5 100644 --- 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 %> diff --git a/config/ldap.yml b/config/ldap.yml index 345f530..41a37ab 100644 --- 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