Page MenuHomeDevCentral
Files F12989477

D3816.id9902.diff
No OneTemporary
Actions

D3816.id9902.diff
View Options

diff --git a/pillar/paas/alkane/web-001/main.sls b/pillar/paas/alkane/web-001/main.sls
--- a/pillar/paas/alkane/web-001/main.sls
+++ b/pillar/paas/alkane/web-001/main.sls
@@ -169,9 +169,9 @@
webserver_content_dotenv:
/var/wwwroot/dereckson.be/www/.env:
user: web-be-dereckson-www
- db:
- service: db-B
- credentials: dbserver/cluster-B/users/dereckson_www
+ databases:
+ - service: db-B
+ credentials: dbserver/cluster-B/users/dereckson_www
# -------------------------------------------------------------
# Alkane deployment recipes
diff --git a/pillar/paas/alkane/web-001/zed.sls b/pillar/paas/alkane/web-001/zed.sls
--- a/pillar/paas/alkane/web-001/zed.sls
+++ b/pillar/paas/alkane/web-001/zed.sls
@@ -42,9 +42,9 @@
webserver_content_dotenv:
/var/wwwroot/hypership.space/www/.env:
user: web-space-hypership-www
- db:
- service: db-B
- credentials: dbserver/cluster-B/users/zed
+ databases:
+ - service: db-B
+ credentials: dbserver/cluster-B/users/zed
extra_values:
DB_NAME: zed_prod
extra_credentials:
diff --git a/pillar/paas/alkane/windriver/main.sls b/pillar/paas/alkane/windriver/main.sls
--- a/pillar/paas/alkane/windriver/main.sls
+++ b/pillar/paas/alkane/windriver/main.sls
@@ -134,6 +134,6 @@
webserver_content_dotenv:
/var/51-wwwroot/dereckson-www/.env:
user: web-be-dereckson-www51
- db:
- service: db-B
- credentials: dbserver/cluster-B/users/dereckson_www51
+ databases:
+ - service: db-B
+ credentials: dbserver/cluster-B/users/dereckson_www51
diff --git a/pillar/paas/alkane/windriver/obsidian.sls b/pillar/paas/alkane/windriver/obsidian.sls
--- a/pillar/paas/alkane/windriver/obsidian.sls
+++ b/pillar/paas/alkane/windriver/obsidian.sls
@@ -34,8 +34,8 @@
webserver_content_dotenv:
/var/51-wwwroot/obsidian/.env:
user: web-org-nasqueron-obsidian51
- db:
- service: db-B
- credentials: dbserver/cluster-B/users/obsidian51
+ databases:
+ - service: db-B
+ credentials: dbserver/cluster-B/users/obsidian51
extra_values:
DB_NAME: obsidian51
diff --git a/roles/webserver-content/_generic/init.sls b/roles/webserver-content/_generic/init.sls
--- a/roles/webserver-content/_generic/init.sls
+++ b/roles/webserver-content/_generic/init.sls
@@ -11,8 +11,6 @@
{% for env_path, env_args in pillar.get("webserver_content_dotenv", {}).items() %}
-{% set db_credentials = env_args["db"]["credentials"] %}
-
{{ env_path }}:
file.managed:
- source: salt://roles/webserver-content/_generic/files/dot.env
@@ -22,11 +20,12 @@
- template: jinja
- context:
environment:
- {% if "db" in env_args %}
- DB_HOST: {{ pillar["nasqueron_services"][env_args["db"]["service"]] }}
- DB_USER: {{ salt["credentials.get_username"](db_credentials) }}
- DB_PASSWORD: {{ salt["credentials.get_password"](db_credentials) }}
- {% endif %}
+ {% for db in env_args.get("databases", {}) %}
+ {% set prefix = db.get("prefix", "") %}
+ {{ prefix }}DB_HOST: {{ pillar["nasqueron_services"][db["service"]] }}
+ {{ prefix }}DB_USER: {{ salt["credentials.get_username"](db["credentials"]) }}
+ {{ prefix }}DB_PASSWORD: {{ salt["credentials.get_password"](db["credentials"]) }}
+ {% endfor %}
{% if "vault" in env_args %}
VAULT_ROLE_ID: {{ salt["credentials.get_username"](env_args["vault"]) }}

File Metadata

Mime Type
text/plain
Expires
Tue, Nov 18, 13:14 (22 h, 19 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3180319
Default Alt Text
D3816.id9902.diff (3 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator