Page MenuHomeDevCentral
Files F7137135

D1347.id3451.diff
No OneTemporary
Actions

D1347.id3451.diff
View Options

diff --git a/pillar/top.sls b/pillar/top.sls
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -18,4 +18,5 @@
ysul:
- viperserv.bots
- viperserv.fantoir
+ - webserver.labs
- webserver.wwwroot51
diff --git a/roles/webserver-content/init.sls b/pillar/webserver/labs.sls
copy from roles/webserver-content/init.sls
copy to pillar/webserver/labs.sls
--- a/roles/webserver-content/init.sls
+++ b/pillar/webserver/labs.sls
@@ -1,15 +1,10 @@
# -------------------------------------------------------------
-# Salt — Webserver content
+# Salt — Sites to provision on the devserver labs
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Project: Eglide
-# Created: 2017-11-23
+# Project: Nasqueron
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
-include:
- - .be/dereckson
- - .com/paysannerebelle
- - .org/eglide
- - .org/nasqueron/api
- - .org/nasqueron/docs
- - .org/nasqueron/social
+web_labs:
+ - HexGL
+ - corporate-name-generator
diff --git a/pillar/webserver/sites.sls b/pillar/webserver/sites.sls
--- a/pillar/webserver/sites.sls
+++ b/pillar/webserver/sites.sls
@@ -99,6 +99,7 @@
# Directly managed by Nasqueron
- .org/nasqueron/api
- .org/nasqueron/docs
+ - .org/nasqueron/labs
# -------------------------------------------------------------
# Tweaks
diff --git a/roles/webserver-content/init.sls b/roles/webserver-content/init.sls
--- a/roles/webserver-content/init.sls
+++ b/roles/webserver-content/init.sls
@@ -12,4 +12,5 @@
- .org/eglide
- .org/nasqueron/api
- .org/nasqueron/docs
+ - .org/nasqueron/labs
- .org/nasqueron/social
diff --git a/roles/webserver-content/org/nasqueron/labs.sls b/roles/webserver-content/org/nasqueron/labs.sls
new file mode 100644
--- /dev/null
+++ b/roles/webserver-content/org/nasqueron/labs.sls
@@ -0,0 +1,48 @@
+# -------------------------------------------------------------
+# Salt — Provision docs.nasqueron.org website
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# License: Trivial work, not eligible to copyright
+# -------------------------------------------------------------
+
+{% if salt['node.has_web_content'](".org/nasqueron/labs") %}
+
+# -------------------------------------------------------------
+# Base directory
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+/var/wwwroot/nasqueron.org/labs:
+ file.directory:
+ - user: deploy
+ - group: web
+ - dir_mode: 755
+
+labs_base_directory_content:
+ file.recurse:
+ - name: /var/wwwroot/nasqueron.org/labs
+ - source: salt://wwwroot/nasqueron.org/labs/public
+ - exclude_pat: E@.git
+ - user: deploy
+ - group: web
+ - dir_mode: 755
+ - file_mode: 644
+ - clean: False
+
+# -------------------------------------------------------------
+# Labs directories
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+{% for lab in pillar['web_labs'] %}
+labs_lab_directory_{{ lab }}:
+ file.recurse:
+ - name: /var/wwwroot/nasqueron.org/labs/{{ lab }}
+ - source: salt://software/{{ lab }}
+ - exclude_pat: E@.git
+ - user: deploy
+ - group: web
+ - dir_mode: 755
+ - file_mode: 644
+ - clean: False
+{% endfor %}
+
+{% endif %}

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 22, 07:25 (11 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2594650
Default Alt Text
D1347.id3451.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