Page MenuHomeDevCentral

D3160.id8064.diff
No OneTemporary

D3160.id8064.diff

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
@@ -133,3 +133,49 @@
env:
CACHE_DIR: /var/cache/zed/hypership.space
CONTENT_DIR: /srv/zed/content
+
+# -------------------------------------------------------------
+# nginx configuration
+#
+# Configuration files to provision to vhosts/
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+nginx_vhosts:
+ dereckson.be:
+ - assets
+ - hg
+ - mediawiki
+ - scherzo
+ - www
+
+ espace-win.org:
+ - cosmo
+ - www
+
+ hypership.space:
+ - www
+
+ nasqueron.org:
+ - api
+ - assets
+ - autoconfig
+ - daeghrefn
+ - docker
+ - docs
+ - ftp
+ - infra
+ - join
+ - labs
+ - launch
+ - packages
+ - rain
+ - trustspace
+ - www
+
+ test.ook.space:
+ - migration.mediawiki
+
+ wolfplex.org:
+ - api
+ - assets
+ - www
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
@@ -84,3 +84,16 @@
subdomain: www51
user: web-org-espacewin-www51
php-fpm: prod
+
+# -------------------------------------------------------------
+# nginx configuration
+#
+# Configuration files to provision to vhosts/
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+nginx_vhosts:
+ dereckson.be:
+ - mediawiki
+
+ nasqueron.org:
+ - tools51
diff --git a/roles/webserver-legacy/nginx/config.sls b/roles/webserver-alkane/nginx/config.sls
rename from roles/webserver-legacy/nginx/config.sls
rename to roles/webserver-alkane/nginx/config.sls
--- a/roles/webserver-legacy/nginx/config.sls
+++ b/roles/webserver-alkane/nginx/config.sls
@@ -14,10 +14,10 @@
# :: application-specific code
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-webserver_legacy_nginx_includes:
+webserver_alkane_nginx_includes:
file.recurse:
- name: {{ dirs.etc }}/nginx/includes
- - source: salt://roles/webserver-legacy/nginx/files/includes
+ - source: salt://roles/webserver-alkane/nginx/files/includes
- dir_mode: 755
- file_mode: 644
@@ -25,12 +25,24 @@
# vhosts folder
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-webserver_legacy_nginx_vhosts:
- file.recurse:
- - name: {{ dirs.etc }}/nginx/vhosts
- - source: salt://roles/webserver-legacy/nginx/files/vhosts
- - dir_mode: 755
- - file_mode: 644
+{{ dirs.etc }}/nginx/vhosts:
+ file.directory:
+ - mode: 711
+
+{% for domain, subdomains in pillar["nginx_vhosts"].items() %}
+
+{{ dirs.etc }}/nginx/vhosts/{{ domain }}:
+ file.directory:
+ - mode: 711
+
+{% for subdomain in subdomains %}
+{{ dirs.etc }}/nginx/vhosts/{{ domain }}/{{ subdomain }}.conf:
+ file.managed:
+ - source: salt://roles/webserver-alkane/nginx/files/vhosts/{{ domain }}/{{ subdomain }}.conf
+ - mode: 644
- template: jinja
- context:
services: {{ pillar["nasqueron_services"] }}
+{% endfor %}
+
+{% endfor %}
diff --git a/roles/webserver-legacy/nginx/files/includes/pluton b/roles/webserver-alkane/nginx/files/includes/pluton
rename from roles/webserver-legacy/nginx/files/includes/pluton
rename to roles/webserver-alkane/nginx/files/includes/pluton
--- a/roles/webserver-legacy/nginx/files/includes/pluton
+++ b/roles/webserver-alkane/nginx/files/includes/pluton
@@ -6,7 +6,7 @@
# Project: Keruald
# Description: nginx
# License: Trivial work, not eligible for copyright.
-# Source file: roles/webserver-legacy/nginx/files/includes/pluton
+# Source file: roles/webserver-alkane/nginx/files/includes/pluton
# -------------------------------------------------------------
#
# <auto-generated>
diff --git a/roles/webserver-legacy/nginx/files/vhosts/dereckson.be/assets.conf b/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/assets.conf
rename from roles/webserver-legacy/nginx/files/vhosts/dereckson.be/assets.conf
rename to roles/webserver-alkane/nginx/files/vhosts/dereckson.be/assets.conf
--- a/roles/webserver-legacy/nginx/files/vhosts/dereckson.be/assets.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/assets.conf
@@ -3,7 +3,7 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Site: assets.dereckson.be
# License: Trivial work, not eligible to copyright
-# Source file: roles/webserver-legacy/nginx/files/vhosts/dereckson.be/assets.conf
+# Source file: roles/webserver-alkane/nginx/files/vhosts/dereckson.be/assets.conf
# -------------------------------------------------------------
#
# <auto-generated>
diff --git a/roles/webserver-legacy/nginx/files/vhosts/dereckson.be/hg.conf b/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/hg.conf
rename from roles/webserver-legacy/nginx/files/vhosts/dereckson.be/hg.conf
rename to roles/webserver-alkane/nginx/files/vhosts/dereckson.be/hg.conf
--- a/roles/webserver-legacy/nginx/files/vhosts/dereckson.be/hg.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/hg.conf
@@ -3,7 +3,7 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Site: hg.dereckson.be
# License: Trivial work, not eligible to copyright
-# Source file: roles/webserver-legacy/nginx/files/vhosts/dereckson.be/hg.conf
+# Source file: roles/webserver-alkane/nginx/files/vhosts/dereckson.be/hg.conf
# -------------------------------------------------------------
#
# <auto-generated>
diff --git a/roles/webserver-legacy/nginx/files/vhosts/dereckson.be/mediawiki.conf b/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/mediawiki.conf
rename from roles/webserver-legacy/nginx/files/vhosts/dereckson.be/mediawiki.conf
rename to roles/webserver-alkane/nginx/files/vhosts/dereckson.be/mediawiki.conf
--- a/roles/webserver-legacy/nginx/files/vhosts/dereckson.be/mediawiki.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/mediawiki.conf
@@ -3,7 +3,7 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Site: mediawiki.dereckson.be
# License: Trivial work, not eligible to copyright
-# Source file: roles/webserver-legacy/nginx/files/vhosts/dereckson.be/mediawiki.conf
+# Source file: roles/webserver-alkane/nginx/files/vhosts/dereckson.be/mediawiki.conf
# -------------------------------------------------------------
#
# <auto-generated>
diff --git a/roles/webserver-legacy/nginx/files/vhosts/dereckson.be/scherzo.conf b/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/scherzo.conf
rename from roles/webserver-legacy/nginx/files/vhosts/dereckson.be/scherzo.conf
rename to roles/webserver-alkane/nginx/files/vhosts/dereckson.be/scherzo.conf
--- a/roles/webserver-legacy/nginx/files/vhosts/dereckson.be/scherzo.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/scherzo.conf
@@ -3,7 +3,7 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Site: scherzo.dereckson.be
# License: Trivial work, not eligible to copyright
-# Source file: roles/webserver-legacy/nginx/files/vhosts/dereckson.be/scherzo.conf
+# Source file: roles/webserver-alkane/nginx/files/vhosts/dereckson.be/scherzo.conf
# -------------------------------------------------------------
#
# <auto-generated>
diff --git a/roles/webserver-legacy/nginx/files/vhosts/dereckson.be/www.conf b/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/www.conf
rename from roles/webserver-legacy/nginx/files/vhosts/dereckson.be/www.conf
rename to roles/webserver-alkane/nginx/files/vhosts/dereckson.be/www.conf
--- a/roles/webserver-legacy/nginx/files/vhosts/dereckson.be/www.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/www.conf
@@ -4,7 +4,7 @@
# Project: Nasqueron
# Site: www.dereckson.be
# License: Trivial work, not eligible to copyright
-# Source file: roles/webserver-legacy/nginx/files/vhosts/dereckson.be/www.conf
+# Source file: roles/webserver-alkane/nginx/files/vhosts/dereckson.be/www.conf
# -------------------------------------------------------------
#
# <auto-generated>
diff --git a/roles/webserver-legacy/nginx/files/vhosts/espace-win.org/cosmo.conf b/roles/webserver-alkane/nginx/files/vhosts/espace-win.org/cosmo.conf
rename from roles/webserver-legacy/nginx/files/vhosts/espace-win.org/cosmo.conf
rename to roles/webserver-alkane/nginx/files/vhosts/espace-win.org/cosmo.conf
--- a/roles/webserver-legacy/nginx/files/vhosts/espace-win.org/cosmo.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/espace-win.org/cosmo.conf
@@ -4,7 +4,7 @@
# Project: Nasqueron
# Site: cosmo.espace-win.org
# License: Trivial work, not eligible to copyright
-# Source file: roles/webserver-legacy/nginx/files/vhosts/espace-win.org/cosmo.conf
+# Source file: roles/webserver-alkane/nginx/files/vhosts/espace-win.org/cosmo.conf
# -------------------------------------------------------------
#
# <auto-generated>
diff --git a/roles/webserver-legacy/nginx/files/vhosts/espace-win.org/www.conf b/roles/webserver-alkane/nginx/files/vhosts/espace-win.org/www.conf
rename from roles/webserver-legacy/nginx/files/vhosts/espace-win.org/www.conf
rename to roles/webserver-alkane/nginx/files/vhosts/espace-win.org/www.conf
--- a/roles/webserver-legacy/nginx/files/vhosts/espace-win.org/www.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/espace-win.org/www.conf
@@ -4,7 +4,7 @@
# Project: Nasqueron
# Site: www.espace-win.org
# License: Trivial work, not eligible to copyright
-# Source file: roles/webserver-legacy/nginx/files/vhosts/espace-win.org/www.conf
+# Source file: roles/webserver-alkane/nginx/files/vhosts/espace-win.org/www.conf
# -------------------------------------------------------------
#
# <auto-generated>
diff --git a/roles/webserver-legacy/nginx/files/vhosts/hypership.space/www.conf b/roles/webserver-alkane/nginx/files/vhosts/hypership.space/www.conf
rename from roles/webserver-legacy/nginx/files/vhosts/hypership.space/www.conf
rename to roles/webserver-alkane/nginx/files/vhosts/hypership.space/www.conf
--- a/roles/webserver-legacy/nginx/files/vhosts/hypership.space/www.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/hypership.space/www.conf
@@ -3,7 +3,7 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Site: hypership.space
# License: Trivial work, not eligible to copyright
-# Source file: roles/webserver-legacy/nginx/files/vhosts/hypership.space/www.conf
+# Source file: roles/webserver-alkane/nginx/files/vhosts/hypership.space/www.conf
# -------------------------------------------------------------
#
# <auto-generated>
diff --git a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/api.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/api.conf
rename from roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/api.conf
rename to roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/api.conf
--- a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/api.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/api.conf
@@ -4,7 +4,7 @@
# Project: Nasqueron
# Site: api.nasqueron.org
# License: Trivial work, not eligible to copyright
-# Source file: roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/api.conf
+# Source file: roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/api.conf
# -------------------------------------------------------------
#
# <auto-generated>
diff --git a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/assets.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/assets.conf
rename from roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/assets.conf
rename to roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/assets.conf
--- a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/assets.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/assets.conf
@@ -4,7 +4,7 @@
# Project: Nasqueron
# Site: assets.nasqueron.org
# License: Trivial work, not eligible to copyright
-# Source file: roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/assets.conf
+# Source file: roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/assets.conf
# -------------------------------------------------------------
#
# <auto-generated>
diff --git a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/autoconfig.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/autoconfig.conf
rename from roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/autoconfig.conf
rename to roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/autoconfig.conf
--- a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/autoconfig.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/autoconfig.conf
@@ -4,7 +4,7 @@
# Project: Nasqueron
# Site: autoconfig.nasqueron.org
# License: Trivial work, not eligible to copyright
-# Source file: roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/autoconfig.conf
+# Source file: roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/autoconfig.conf
# -------------------------------------------------------------
#
# <auto-generated>
diff --git a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/daeghrefn.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/daeghrefn.conf
rename from roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/daeghrefn.conf
rename to roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/daeghrefn.conf
--- a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/daeghrefn.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/daeghrefn.conf
@@ -4,7 +4,7 @@
# Project: Nasqueron
# Site: daeghrefn.nasqueron.org
# License: Trivial work, not eligible to copyright
-# Source file: roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/daeghrefn.conf
+# Source file: roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/daeghrefn.conf
# -------------------------------------------------------------
#
# <auto-generated>
diff --git a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/docker.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/docker.conf
rename from roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/docker.conf
rename to roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/docker.conf
--- a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/docker.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/docker.conf
@@ -4,7 +4,7 @@
# Project: Nasqueron
# Site: docker.nasqueron.org
# License: Trivial work, not eligible to copyright
-# Source file: roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/docker.conf
+# Source file: roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/docker.conf
# -------------------------------------------------------------
#
# <auto-generated>
diff --git a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/docs.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/docs.conf
rename from roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/docs.conf
rename to roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/docs.conf
--- a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/docs.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/docs.conf
@@ -4,7 +4,7 @@
# Project: Nasqueron
# Site: docs.nasqueron.org
# License: Trivial work, not eligible to copyright
-# Source file: roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/docs.conf
+# Source file: roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/docs.conf
# -------------------------------------------------------------
#
# <auto-generated>
diff --git a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/ftp.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/ftp.conf
rename from roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/ftp.conf
rename to roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/ftp.conf
--- a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/ftp.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/ftp.conf
@@ -4,7 +4,7 @@
# Project: Nasqueron
# Site: ftp.nasqueron.org
# License: Trivial work, not eligible to copyright
-# Source file: roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/ftp.conf
+# Source file: roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/ftp.conf
# -------------------------------------------------------------
#
# <auto-generated>
diff --git a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/infra.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/infra.conf
rename from roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/infra.conf
rename to roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/infra.conf
--- a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/infra.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/infra.conf
@@ -4,7 +4,7 @@
# Project: Nasqueron
# Site: infra.nasqueron.org
# License: Trivial work, not eligible to copyright
-# Source file: roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/infra.conf
+# Source file: roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/infra.conf
# -------------------------------------------------------------
#
# <auto-generated>
diff --git a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/join.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/join.conf
rename from roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/join.conf
rename to roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/join.conf
--- a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/join.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/join.conf
@@ -4,7 +4,7 @@
# Project: Nasqueron
# Site: join.nasqueron.org
# License: Trivial work, not eligible to copyright
-# Source file: roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/join.conf
+# Source file: roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/join.conf
# -------------------------------------------------------------
#
# <auto-generated>
diff --git a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/labs.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/labs.conf
rename from roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/labs.conf
rename to roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/labs.conf
--- a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/labs.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/labs.conf
@@ -4,7 +4,7 @@
# Project: Nasqueron
# Site: labs.nasqueron.org
# License: Trivial work, not eligible to copyright
-# Source file: roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/labs.conf
+# Source file: roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/labs.conf
# -------------------------------------------------------------
#
# <auto-generated>
diff --git a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/launch.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/launch.conf
rename from roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/launch.conf
rename to roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/launch.conf
--- a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/launch.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/launch.conf
@@ -4,7 +4,7 @@
# Project: Nasqueron
# Site: launch.nasqueron.org
# License: Trivial work, not eligible to copyright
-# Source file: roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/launch.conf
+# Source file: roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/launch.conf
# -------------------------------------------------------------
#
# <auto-generated>
diff --git a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/packages.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/packages.conf
rename from roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/packages.conf
rename to roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/packages.conf
--- a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/packages.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/packages.conf
@@ -4,7 +4,7 @@
# Project: Nasqueron
# Site: packages.nasqueron.org
# License: Trivial work, not eligible to copyright
-# Source file: roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/packages.conf
+# Source file: roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/packages.conf
# -------------------------------------------------------------
#
# <auto-generated>
diff --git a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/rain.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/rain.conf
rename from roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/rain.conf
rename to roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/rain.conf
--- a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/rain.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/rain.conf
@@ -4,7 +4,7 @@
# Project: Nasqueron
# Site: rain.nasqueron.org
# License: Trivial work, not eligible to copyright
-# Source file: roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/rain.conf
+# Source file: roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/rain.conf
# -------------------------------------------------------------
#
# <auto-generated>
diff --git a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/tools51.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/tools51.conf
rename from roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/tools51.conf
rename to roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/tools51.conf
--- a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/tools51.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/tools51.conf
@@ -4,7 +4,7 @@
# Project: Nasqueron
# Site: tools51.nasqueron.org
# License: Trivial work, not eligible to copyright
-# Source file: roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/tools51.conf
+# Source file: roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/tools51.conf
# -------------------------------------------------------------
#
# <auto-generated>
diff --git a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/trustspace.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/trustspace.conf
rename from roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/trustspace.conf
rename to roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/trustspace.conf
--- a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/trustspace.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/trustspace.conf
@@ -4,7 +4,7 @@
# Project: Nasqueron
# Site: trustspace.nasqueron.org
# License: Trivial work, not eligible to copyright
-# Source file: roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/trustspace.conf
+# Source file: roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/trustspace.conf
# -------------------------------------------------------------
#
# <auto-generated>
diff --git a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/www.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/www.conf
rename from roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/www.conf
rename to roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/www.conf
--- a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/www.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/www.conf
@@ -4,7 +4,7 @@
# Project: Nasqueron
# Site: www.nasqueron.org
# License: Trivial work, not eligible to copyright
-# Source file: roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/www.conf
+# Source file: roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/www.conf
# -------------------------------------------------------------
#
# <auto-generated>
diff --git a/roles/webserver-legacy/nginx/files/vhosts/test.ook.space/migration.mediawiki.conf b/roles/webserver-alkane/nginx/files/vhosts/test.ook.space/migration.mediawiki.conf
rename from roles/webserver-legacy/nginx/files/vhosts/test.ook.space/migration.mediawiki.conf
rename to roles/webserver-alkane/nginx/files/vhosts/test.ook.space/migration.mediawiki.conf
diff --git a/roles/webserver-legacy/nginx/files/vhosts/wolfplex.org/api.conf b/roles/webserver-alkane/nginx/files/vhosts/wolfplex.org/api.conf
rename from roles/webserver-legacy/nginx/files/vhosts/wolfplex.org/api.conf
rename to roles/webserver-alkane/nginx/files/vhosts/wolfplex.org/api.conf
--- a/roles/webserver-legacy/nginx/files/vhosts/wolfplex.org/api.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/wolfplex.org/api.conf
@@ -4,7 +4,7 @@
# Project: Wolfplex
# Site: api.wolfplex.org
# License: Trivial work, not eligible to copyright
-# Source file: roles/webserver-legacy/nginx/files/vhosts/wolfplex.org/api.conf
+# Source file: roles/webserver-alkane/nginx/files/vhosts/wolfplex.org/api.conf
# -------------------------------------------------------------
#
# <auto-generated>
diff --git a/roles/webserver-legacy/nginx/files/vhosts/wolfplex.org/assets.conf b/roles/webserver-alkane/nginx/files/vhosts/wolfplex.org/assets.conf
rename from roles/webserver-legacy/nginx/files/vhosts/wolfplex.org/assets.conf
rename to roles/webserver-alkane/nginx/files/vhosts/wolfplex.org/assets.conf
--- a/roles/webserver-legacy/nginx/files/vhosts/wolfplex.org/assets.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/wolfplex.org/assets.conf
@@ -3,7 +3,7 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Site: assets.wolfplex.org
# License: Trivial work, not eligible to copyright
-# Source file: roles/webserver-legacy/nginx/files/vhosts/wolfplex.org/assets.conf
+# Source file: roles/webserver-alkane/nginx/files/vhosts/wolfplex.org/assets.conf
# -------------------------------------------------------------
#
# <auto-generated>
diff --git a/roles/webserver-legacy/nginx/files/vhosts/wolfplex.org/www.conf b/roles/webserver-alkane/nginx/files/vhosts/wolfplex.org/www.conf
rename from roles/webserver-legacy/nginx/files/vhosts/wolfplex.org/www.conf
rename to roles/webserver-alkane/nginx/files/vhosts/wolfplex.org/www.conf
--- a/roles/webserver-legacy/nginx/files/vhosts/wolfplex.org/www.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/wolfplex.org/www.conf
@@ -4,7 +4,7 @@
# Project: Wolfplex
# Site: www.wolfplex.org
# License: Trivial work, not eligible to copyright
-# Source file: roles/webserver-legacy/nginx/files/vhosts/wolfplex.org/www.conf
+# Source file: roles/webserver-alkane/nginx/files/vhosts/wolfplex.org/www.conf
# -------------------------------------------------------------
#
# <auto-generated>
diff --git a/roles/webserver-legacy/nginx/init.sls b/roles/webserver-alkane/nginx/init.sls
rename from roles/webserver-legacy/nginx/init.sls
rename to roles/webserver-alkane/nginx/init.sls
diff --git a/roles/webserver-legacy/init.sls b/roles/webserver-legacy/init.sls
--- a/roles/webserver-legacy/init.sls
+++ b/roles/webserver-legacy/init.sls
@@ -10,7 +10,7 @@
include:
- roles/webserver-alkane/account
- roles/webserver-alkane/directories
- - .nginx
+ - roles/webserver-alkane/nginx
- .static-sites
- .php-sites
- .tweaks

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 18, 21:52 (20 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2251301
Default Alt Text
D3160.id8064.diff (27 KB)

Event Timeline