Page MenuHomeDevCentral
Files F3751442

D2821.id7199.diff
No OneTemporary
Actions

D2821.id7199.diff
View Options

diff --git a/pillar/credentials/vault.sls b/pillar/credentials/vault.sls
--- a/pillar/credentials/vault.sls
+++ b/pillar/credentials/vault.sls
@@ -165,6 +165,14 @@
viperserv:
- ops/secrets/nasqueron.viperserv.vault
+ webserver-legacy:
+
+ #
+ # Wolfplex credentials
+ #
+
+ - ops/secrets/nasqueron.etherpad.api
+
# -------------------------------------------------------------
# Vault secrets by dbserver cluster
#
diff --git a/roles/webserver-content/org/wolfplex/api.sls b/roles/webserver-content/org/wolfplex/api.sls
--- a/roles/webserver-content/org/wolfplex/api.sls
+++ b/roles/webserver-content/org/wolfplex/api.sls
@@ -7,6 +7,23 @@
{% if salt['node.has_web_content'](".org/wolfplex/api") %}
+# -------------------------------------------------------------
+# Data store
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+/var/dataroot/wolfplex/secrets.json:
+ file.managed:
+ - source: salt://roles/webserver-content/org/wolfplex/files/secrets.json.jinja2
+ - mode: 400
+ - user: web-org-wolfplex-www
+ - group: web
+ - makedirs: True
+ - template: jinja
+ - show_changes: False
+ - context:
+ secrets:
+ etherpad.api.key: {{ salt['credentials.get_token']("nasqueron.etherpad.api") }}
+
# -------------------------------------------------------------
# Base part
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/roles/webserver-content/org/wolfplex/files/secrets.json.jinja2 b/roles/webserver-content/org/wolfplex/files/secrets.json.jinja2
new file mode 100644
--- /dev/null
+++ b/roles/webserver-content/org/wolfplex/files/secrets.json.jinja2
@@ -0,0 +1 @@
+{{ secrets | json }}

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 18, 08:43 (1 h, 48 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2250492
Default Alt Text
D2821.id7199.diff (1 KB)

Event Timeline

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