Page MenuHomeDevCentral
Files F55665570

D3187.diff
No OneTemporary
Actions

D3187.diff
View Options

diff --git a/pillar/webserver/wwwroot51.sls b/pillar/webserver/wwwroot51.sls
--- a/pillar/webserver/wwwroot51.sls
+++ b/pillar/webserver/wwwroot51.sls
@@ -7,7 +7,7 @@
wwwroot51_basedir: /var/51-wwwroot
-wwwroot51_identities:
+wwwroot_identities:
alken-orin:
secret: nasqueron/deploy/deploy_keys/alken-orin
path: /opt/salt/security/id_alken_orin_ed25519
diff --git a/roles/devserver/webserver-wwwroot51/init.sls b/roles/devserver/webserver-wwwroot51/init.sls
--- a/roles/devserver/webserver-wwwroot51/init.sls
+++ b/roles/devserver/webserver-wwwroot51/init.sls
@@ -6,5 +6,5 @@
# -------------------------------------------------------------
include:
- - .credentials
+ - roles/webserver-alkane/credentials
- .sites
diff --git a/roles/devserver/webserver-wwwroot51/sites.sls b/roles/devserver/webserver-wwwroot51/sites.sls
--- a/roles/devserver/webserver-wwwroot51/sites.sls
+++ b/roles/devserver/webserver-wwwroot51/sites.sls
@@ -34,7 +34,7 @@
# 51 sites
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-{% set identities = pillar["wwwroot51_identities"] %}
+{% set identities = pillar["wwwroot_identities"] %}
{% for sitename, site in pillar['wwwroot51_directories'].items() %}
{{ basedir }}/{{ sitename }}:
diff --git a/roles/devserver/webserver-wwwroot51/credentials.sls b/roles/webserver-alkane/credentials/init.sls
rename from roles/devserver/webserver-wwwroot51/credentials.sls
rename to roles/webserver-alkane/credentials/init.sls
--- a/roles/devserver/webserver-wwwroot51/credentials.sls
+++ b/roles/webserver-alkane/credentials/init.sls
@@ -1,5 +1,5 @@
# -------------------------------------------------------------
-# Salt — Webserver wwwroot51 content
+# Salt — Webserver content
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# License: Trivial work, not eligible to copyright
@@ -11,7 +11,7 @@
- makedirs: True
- mode: 700
-{% for _, identity in pillar.get("wwwroot51_identities", {}).items() %}
+{% for _, identity in pillar.get("wwwroot_identities", {}).items() %}
{{ identity["path"] }}:
file.managed:
diff --git a/roles/webserver-alkane/init.sls b/roles/webserver-alkane/init.sls
--- a/roles/webserver-alkane/init.sls
+++ b/roles/webserver-alkane/init.sls
@@ -8,5 +8,6 @@
include:
- .account
- .alkane
+ - .credentials
- .directories
- .php

File Metadata

Mime Type
text/plain
Expires
Sat, Oct 31, 18:12 (23 h, 12 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
4236825
Default Alt Text
D3187.diff (2 KB)

Event Timeline

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