Page MenuHomeDevCentral
Files F3779045

D3210.diff
No OneTemporary
Actions

D3210.diff
View Options

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
@@ -112,6 +112,7 @@
dereckson.be:
- mediawiki
- scherzo
+ - www51
- zed51
nasqueron.org:
diff --git a/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/www.conf b/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/www.conf
--- a/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/www.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/www.conf
@@ -95,48 +95,3 @@
return 301 https://www.dereckson.be/blog/$request_uri;
}
}
-
-# -------------------------------------------------------------
-# Staging area
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-server {
- listen 80;
- listen [::]:80;
- server_name www51.dereckson.be;
-
- #include includes/tls;
- #ssl_certificate /usr/local/etc/letsencrypt/live/www51.dereckson.be/fullchain.pem;
- #ssl_certificate_key /usr/local/etc/letsencrypt/live/www51.dereckson.be/privkey.pem;
-
- error_log /var/log/www/dereckson.be/www51-error.log;
- access_log /var/log/www/dereckson.be/www51-access.log;
-
- root /var/51-wwwroot/dereckson-www;
-
- include includes/letsencrypt;
-
- location = /maintenance.html { }
- error_page 503 /maintenance.html;
-
- location ~ ^/photos/(?<date>([0-9]*)).html$ {
- # If there is no gallery file prepared
- # the main photo handler is happy to
- # include the JPEG with metadata from db
- try_files @app /photos/?date=$date;
- }
-
- # Legacy tool URL
- location /tools/SourceTemplatesGenerator {
- return 301 https://tools.nasqueron.org/wikimedia/write/sourcetemplatesgenerator/;
- }
-
- # Wordpress isn't staged
- location /blog {
- return 301 https://www.dereckson.be$request_uri;
- }
-
- location /Blog { return 503; }
-
- include includes/pluton;
-}
diff --git a/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/www51.conf b/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/www51.conf
new file mode 100644
--- /dev/null
+++ b/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/www51.conf
@@ -0,0 +1,60 @@
+# -------------------------------------------------------------
+# Webserver
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# Site: www51.dereckson.be
+# License: Trivial work, not eligible to copyright
+# Source file: roles/webserver-alkane/nginx/files/vhosts/dereckson.be/www51.conf
+# -------------------------------------------------------------
+#
+# <auto-generated>
+# This file is managed by our rOPS SaltStack repository.
+#
+# Changes to this file may cause incorrect behavior
+# and will be lost if the state is redeployed.
+# </auto-generated>
+
+# -------------------------------------------------------------
+# Staging area
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+server {
+ listen 80;
+ listen [::]:80;
+ server_name www51.dereckson.be;
+
+ include includes/tls;
+ ssl_certificate /usr/local/etc/letsencrypt/live/www51.dereckson.be/fullchain.pem;
+ ssl_certificate_key /usr/local/etc/letsencrypt/live/www51.dereckson.be/privkey.pem;
+
+ error_log /var/log/www/dereckson.be/www51-error.log;
+ access_log /var/log/www/dereckson.be/www51-access.log;
+
+ root /var/51-wwwroot/dereckson-www;
+
+ include includes/letsencrypt;
+
+ location = /maintenance.html { }
+ error_page 503 /maintenance.html;
+
+ location ~ ^/photos/(?<date>([0-9]*)).html$ {
+ # If there is no gallery file prepared
+ # the main photo handler is happy to
+ # include the JPEG with metadata from db
+ try_files @app /photos/?date=$date;
+ }
+
+ # Legacy tool URL
+ location /tools/SourceTemplatesGenerator {
+ return 301 https://tools.nasqueron.org/wikimedia/write/sourcetemplatesgenerator/;
+ }
+
+ # Wordpress isn't staged
+ location /blog {
+ return 301 https://www.dereckson.be$request_uri;
+ }
+
+ location /Blog { return 503; }
+
+ include includes/pluton;
+}

File Metadata

Mime Type
text/plain
Expires
Tue, Nov 26, 07:07 (10 h, 35 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2262707
Default Alt Text
D3210.diff (4 KB)

Event Timeline

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