Page MenuHomeDevCentral

No OneTemporary

diff --git a/roles/webserver-legacy/nginx/files/vhosts/dereckson.be/www.conf b/roles/webserver-legacy/nginx/files/vhosts/dereckson.be/www.conf
index 6deda75..7c4e39f 100644
--- a/roles/webserver-legacy/nginx/files/vhosts/dereckson.be/www.conf
+++ b/roles/webserver-legacy/nginx/files/vhosts/dereckson.be/www.conf
@@ -1,154 +1,154 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# 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
# -------------------------------------------------------------
#
# <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>
server {
listen 80;
listen [::]:80;
server_name www.dereckson.be;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/dereckson.be/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/dereckson.be/privkey.pem;
error_log /var/log/www/dereckson.be/www-error.log;
access_log /var/log/www/dereckson.be/www-access.log;
root /var/wwwroot/dereckson.be/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
location /blog {
alias /srv/wordpress;
try_files $uri $uri/ @blog;
}
location @blog {
fastcgi_pass unix:/var/run/web/www.dereckson.be/php-fpm.sock;
include fastcgi_params;
fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME /srv/wordpress/index.php;
}
location ~ /blog/(.*)\.php {
root /srv/wordpress;
fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_pass unix:/var/run/web/www.dereckson.be/php-fpm.sock;
include fastcgi_params;
fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME /srv/wordpress/$1.php;
}
location /Blog { return 503; }
include includes/pluton;
}
# -------------------------------------------------------------
-# Domain and protocol redirections
+# Domain and protocol redirects
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
server {
listen 80;
listen [::]:80;
server_name dereckson.be;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/dereckson.be/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/dereckson.be/privkey.pem;
include includes/letsencrypt;
location / {
return 301 https://www.dereckson.be$request_uri;
}
}
server {
listen 80;
listen [::]:80;
server_name blog.dereckson.be;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/blog.dereckson.be/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/blog.dereckson.be/privkey.pem;
include includes/letsencrypt;
location / {
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-legacy/nginx/files/vhosts/espace-win.org/www.conf b/roles/webserver-legacy/nginx/files/vhosts/espace-win.org/www.conf
index 54d79d9..8b68b73 100644
--- a/roles/webserver-legacy/nginx/files/vhosts/espace-win.org/www.conf
+++ b/roles/webserver-legacy/nginx/files/vhosts/espace-win.org/www.conf
@@ -1,81 +1,81 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# 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
# -------------------------------------------------------------
#
# <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>
server {
listen 80;
listen [::]:80;
server_name www.espace-win.org;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/www.espace-win.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/www.espace-win.org/privkey.pem;
error_log /var/log/www/espace-win.org/www-error.log;
access_log /var/log/www/espace-win.org/www-access.log;
root /var/wwwroot/espace-win.org/www;
include includes/letsencrypt;
location / {
# We need to install PHP 5, or to achieve PHP 7 migration
# before include Pluton.
return 503;
}
}
# -------------------------------------------------------------
-# Domain and protocol redirections
+# Domain and protocol redirects
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
server {
listen 80;
listen [::]:80;
server_name espace-win.org espace-win.net www.espace-win.net;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/www.espace-win.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/www.espace-win.org/privkey.pem;
include includes/letsencrypt;
location / {
return 301 https://www.espace-win.org$request_uri;
}
}
# -------------------------------------------------------------
# Staging area
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
server {
listen 80;
listen [::]:80;
server_name www51.espace-win.org;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/www.espace-win.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/www.espace-win.org/privkey.pem;
error_log /var/log/www/espace-win.org/www51-error.log;
access_log /var/log/www/espace-win.org/www51-access.log;
root /var/51-wwwroot/espacewin-www;
include includes/letsencrypt;
include includes/pluton;
}

File Metadata

Mime Type
text/x-diff
Expires
Mon, Mar 9, 23:56 (10 h, 20 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3509416
Default Alt Text
(7 KB)

Event Timeline