Page MenuHomeDevCentral
Files F12241828

No OneTemporary
Actions

View Options

diff --git a/roles/webserver-legacy/directories/init.sls b/roles/webserver-alkane/directories/init.sls
similarity index 86%
rename from roles/webserver-legacy/directories/init.sls
rename to roles/webserver-alkane/directories/init.sls
index 4699f69..97ff873 100644
--- a/roles/webserver-legacy/directories/init.sls
+++ b/roles/webserver-alkane/directories/init.sls
@@ -1,30 +1,28 @@
# -------------------------------------------------------------
-# Salt — Sites to provision on the legacy web server
-#
-# Currently, this is deployed to ysul.nasqueron.org
+# Salt — Sites to provision on the web server
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
/var/wwwroot:
file.directory:
- group: web
- dir_mode: 711
{% for domains_group in pillar['web_domains'] %}
{% for domain in pillar['web_domains'][domains_group] %}
webserver_directory_{{ domain }}:
file.directory:
- name: /var/wwwroot/{{ domain }}
- user: {{ domain }}
- group: web
- dir_mode: 711
/var/log/www/{{ domain }}:
file.directory:
- user: {{ domain }}
- group: web
- dir_mode: 711
{% endfor %}
{% endfor %}
diff --git a/roles/webserver-alkane/init.sls b/roles/webserver-alkane/init.sls
index 061c8e9..4c7a885 100644
--- a/roles/webserver-alkane/init.sls
+++ b/roles/webserver-alkane/init.sls
@@ -1,10 +1,11 @@
# -------------------------------------------------------------
# Salt :: Alkane :: Nasqueron PaaS for static and PHP sites
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
include:
- .account
- .alkane
+ - .directories
diff --git a/roles/webserver-legacy/init.sls b/roles/webserver-legacy/init.sls
index d520409..00f4f82 100644
--- a/roles/webserver-legacy/init.sls
+++ b/roles/webserver-legacy/init.sls
@@ -1,16 +1,16 @@
# -------------------------------------------------------------
# Salt — Sites to provision on the legacy web server
#
# Currently, this is deployed to ysul.nasqueron.org
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
include:
- roles/webserver-alkane/account
- - .directories
+ - roles/webserver-alkane/directories
- .nginx
- .static-sites
- .php-sites
- .tweaks

File Metadata

Mime Type
text/x-diff
Expires
Sun, Oct 12, 06:44 (18 h, 58 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3065297
Default Alt Text
(2 KB)

Event Timeline

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