Update configuration

City-of-Helsinki · May 2, 2023 · cdbc7ac · cdbc7ac
1 parent fe03fef
commit cdbc7ac
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 65 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php
@@ -184,6 +184,12 @@
   $config['helfi_api_base.api_accounts']['accounts'] = json_decode(base64_decode($api_accounts), TRUE);
 }
 
+// Map vault accounts. The value should be a base64 encoded JSON string.
+// @see https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/blob/main/documentation/api-accounts.md.
+if ($vault_accounts = getenv('DRUPAL_VAULT_ACCOUNTS')) {
+  $config['helfi_api_base.api_accounts']['vault'] = json_decode(base64_decode($vault_accounts), TRUE);
+}
+
 // Override session suffix when present.
 if ($session_suffix = getenv('DRUPAL_SESSION_SUFFIX')) {
   $config['helfi_proxy.settings']['session_suffix'] = $session_suffix;

diff --git a/tools/make/utils.mk b/tools/make/utils.mk
@@ -21,7 +21,7 @@ endif
 
 PHONY += --open-db-gui
 --open-db-gui:
-	@open mysql://$(DB_USER):$(DB_PASS)@$(shell docker port $(DB_CONTAINER) 3306)/$(DB_NAME)
+	@open mysql://$(DB_USER):$(DB_PASS)@$(shell docker port $(DB_CONTAINER) 3306 | grep -v ::)/$(DB_NAME)
 
 define dbg
 	@printf "${GREEN}${1}:${NO_COLOR} ${2}\n"