Page MenuHomeDevCentral
Files F27207457

No OneTemporary
Actions

View Options

diff --git a/pillar/paas/alkane/windriver/main.sls b/pillar/paas/alkane/windriver/main.sls
index 41b25b6..7b35766 100644
--- a/pillar/paas/alkane/windriver/main.sls
+++ b/pillar/paas/alkane/windriver/main.sls
@@ -1,120 +1,121 @@
# -------------------------------------------------------------
# Salt — PaaS Alkane :: PHP and static sites [development]
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
web_aliases:
services:
- &db-B 172.27.27.9
# -------------------------------------------------------------
# Domains we deploy
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
web_domains:
#
# Directly managed by Nasqueron
#
nasqueron:
- nasqueron.org
- ook.space
#
# Nasqueron members
#
nasqueron_members:
- dereckson.be
- hypership.space
#
# Projects ICT is managed by Nasqueron
#
espacewin:
- espace-win.org
wolfplex:
- wolfplex.org
# -------------------------------------------------------------
# Static sites
#
# Sites to deploy from the staging repository
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
web_static_sites:
nasqueron.org:
- docker51
- rain51
- www51
# -------------------------------------------------------------
# PHP sites
#
# Username must be unique and use max 31 characters.
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
php_fpm_instances:
# PHP current version, generally installed as package/port
prod:
command: /usr/local/sbin/php-fpm
web_php_sites:
# Nasqueron
tools51.nasqueron.org:
domain: nasqueron.org
subdomain: tools51
user: web-org-nasqueron-tools51
php-fpm: prod
# Nasqueron members
mediawiki.dereckson.be:
domain: dereckson.be
subdomain: mediawiki
user: web-be-dereckson-mw
php-fpm: prod
www51.dereckson.be:
domain: dereckson.be
subdomain: www51
user: web-be-dereckson-www51
php-fpm: prod
# Zed
zed51.dereckson.be:
domain: dereckson.be
subdomain: zed51
user: web-be-dereckson-zed51
php-fpm: prod
env:
CACHE_DIR: /var/dataroot/zed/cache
CONTENT_DIR: /var/dataroot/zed/content
# Espace Win
www51.espace-win.org:
domain: espace-win.org
subdomain: www51
user: web-org-espacewin-www51
php-fpm: prod
# -------------------------------------------------------------
# nginx configuration
#
# Configuration files to provision to vhosts/
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
nginx_vhosts:
dereckson.be:
- mediawiki
- scherzo
+ - www51
- zed51
nasqueron.org:
- api51
- tools51
- www51
diff --git a/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/www.conf b/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/www.conf
index b02ed26..8cbad7c 100644
--- a/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/www.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/www.conf
@@ -1,142 +1,97 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Site: www.dereckson.be
# License: Trivial work, not eligible to copyright
# Source file: roles/webserver-alkane/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
include includes/wordpress-standalone-subdir;
# DotClear - old posts contents
location /blog/images { alias /var/wwwroot/dereckson.be/www/Blog/images; }
location /Blog/images {}
# DotClear - migrate post URLs and serve 503 for the remaining content
location ~ ^/Blog/index.php/(?<date>(.*))/[0-9]+-(?<title>(.*))$ {
return 301 https://www.dereckson.be/blog/$date/$title;
}
include includes/pluton;
}
# -------------------------------------------------------------
# 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-alkane/nginx/files/vhosts/dereckson.be/www51.conf b/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/www51.conf
new file mode 100644
index 0000000..3b2106d
--- /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/x-diff
Expires
Sun, May 3, 05:52 (1 d, 24 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3677702
Default Alt Text
(9 KB)

Event Timeline

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