Page MenuHomeDevCentral
Files F53865157

No OneTemporary
Actions

View Options

diff --git a/pillar/paas/alkane/web-001/main.sls b/pillar/paas/alkane/web-001/main.sls
index 764c5a4..9b3799b 100644
--- a/pillar/paas/alkane/web-001/main.sls
+++ b/pillar/paas/alkane/web-001/main.sls
@@ -1,135 +1,181 @@
# -------------------------------------------------------------
# Salt — PaaS Alkane :: PHP and static sites [production]
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# 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:
dereckson.be:
- assets
nasqueron.org:
- www
- assets
- docker
- ftp
- launch
- packages
- trustspace
wolfplex.org:
- www
- assets
# -------------------------------------------------------------
# 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 members
www.dereckson.be:
domain: dereckson.be
subdomain: www
user: web-be-dereckson-www
source: wwwroot/dereckson.be/www
target: /var/wwwroot/dereckson.be/www
php-fpm: prod
capabilities:
- wordpress
# Directly managed by Nasqueron
api.nasqueron.org:
domain: nasqueron.org
subdomain: api
user: web-org-nasqueron-api-serverslog
php-fpm: prod
env:
SERVERS_LOG_FILE: /srv/api/data/servers-log-all.json
wikis.nasqueron.org:
domain: nasqueron.org
subdomain: wikis
user: mediawiki
php-fpm: prod
skipCreateUser: True
env:
MEDIAWIKI_ENTRY_POINT: /srv/mediawiki/index.php
DB_HOST: *db-B
DB_USER: saas-mediawiki
# Espace Win
www.espace-win.org:
domain: espace-win.org
subdomain: www
user: web-org-espacewin-www
source: wwwroot/espace-win.org/www
target: /var/wwwroot/espace-win.org/www
php-fpm: prod
# Wolfplex Hackerspace
www.wolfplex.org:
domain: wolfplex.org
subdomain: www
user: web-org-wolfplex-www
php-fpm: prod
env:
DATASTORE: /var/dataroot/wolfplex
CREDENTIAL_PATH_DATASOURCES_SECURITYDATA: /var/dataroot/wolfplex/secrets.json
# Zed - HyperShip
hypership.space:
domain: hypership.space
subdomain: www
user: web-space-hypership-www
php-fpm: prod
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
index c1771e3..029462c 100644
--- a/pillar/paas/alkane/windriver/main.sls
+++ b/pillar/paas/alkane/windriver/main.sls
@@ -1,86 +1,99 @@
# -------------------------------------------------------------
# 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 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
# 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
+
+ nasqueron.org:
+ - tools51
diff --git a/roles/webserver-legacy/nginx/config.sls b/roles/webserver-alkane/nginx/config.sls
similarity index 63%
rename from roles/webserver-legacy/nginx/config.sls
rename to roles/webserver-alkane/nginx/config.sls
index 7eb4da0..b37d0af 100644
--- a/roles/webserver-legacy/nginx/config.sls
+++ b/roles/webserver-alkane/nginx/config.sls
@@ -1,36 +1,48 @@
# -------------------------------------------------------------
# Salt — Sites to provision on the legacy web server
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
{% from "map.jinja" import dirs with context %}
# -------------------------------------------------------------
# includes folder
#
# :: general configuration
# :: 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
# -------------------------------------------------------------
# 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
similarity index 94%
rename from roles/webserver-legacy/nginx/files/includes/pluton
rename to roles/webserver-alkane/nginx/files/includes/pluton
index c8a1dee..e00529b 100644
--- a/roles/webserver-legacy/nginx/files/includes/pluton
+++ b/roles/webserver-alkane/nginx/files/includes/pluton
@@ -1,37 +1,37 @@
# -------------------------------------------------------------
# Configuration for Keruald/Pluton web sites
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Author: Sébastien Santoro aka Dereckson
# Created: 2017-11-24
# 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>
# 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>
index index.html index.php index.htm;
location / {
try_files $uri @app;
}
location ~ \.html$ {
fastcgi_pass unix:/var/run/web/$server_name/php-fpm.sock;
fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $document_root/index.php;
include fastcgi_params;
}
location @app {
fastcgi_pass unix:/var/run/web/$server_name/php-fpm.sock;
fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $document_root/index.php;
include fastcgi_params;
}
diff --git a/roles/webserver-legacy/nginx/files/vhosts/dereckson.be/assets.conf b/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/assets.conf
similarity index 94%
rename from roles/webserver-legacy/nginx/files/vhosts/dereckson.be/assets.conf
rename to roles/webserver-alkane/nginx/files/vhosts/dereckson.be/assets.conf
index 3e3723a..fa86ddb 100644
--- a/roles/webserver-legacy/nginx/files/vhosts/dereckson.be/assets.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/assets.conf
@@ -1,31 +1,31 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# 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>
# 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 assets.dereckson.be;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/assets.dereckson.be/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/assets.dereckson.be/privkey.pem;
error_log /var/log/www/dereckson.be/assets-error.log;
access_log /var/log/www/dereckson.be/assets-access.log;
root /var/wwwroot/dereckson.be/assets;
include includes/letsencrypt;
}
diff --git a/roles/webserver-legacy/nginx/files/vhosts/dereckson.be/hg.conf b/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/hg.conf
similarity index 95%
rename from roles/webserver-legacy/nginx/files/vhosts/dereckson.be/hg.conf
rename to roles/webserver-alkane/nginx/files/vhosts/dereckson.be/hg.conf
index bbb68ec..1991e26 100644
--- a/roles/webserver-legacy/nginx/files/vhosts/dereckson.be/hg.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/hg.conf
@@ -1,50 +1,50 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# 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>
# 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 hg.dereckson.be;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/hg.dereckson.be/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/hg.dereckson.be/privkey.pem;
error_log /var/log/www/dereckson.be/hg-error.log;
access_log /var/log/www/dereckson.be/hg-access.log;
include includes/letsencrypt;
# hg.dereckson.be/zed repository has been renamed zed-hg
location ~ ^/zed(/?.*)$ {
return 302 https://bitbucket.org/dereckson/zed-hg$1;
}
location = /zed {
return 301 https://github.com/dereckson/zed;
}
location = /zed/ {
return 301 https://github.com/dereckson/zed;
}
location ~ ^/freebsd-ports/src/tip/(.*)$ {
return 301 https://github.com/dereckson/freebsd-ports/tree/main/$1;
}
location / {
return 301 https://bitbucket.org/dereckson$request_uri;
}
}
diff --git a/roles/webserver-legacy/nginx/files/vhosts/dereckson.be/mediawiki.conf b/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/mediawiki.conf
similarity index 97%
rename from roles/webserver-legacy/nginx/files/vhosts/dereckson.be/mediawiki.conf
rename to roles/webserver-alkane/nginx/files/vhosts/dereckson.be/mediawiki.conf
index dff9a95..534acca 100644
--- a/roles/webserver-legacy/nginx/files/vhosts/dereckson.be/mediawiki.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/mediawiki.conf
@@ -1,71 +1,71 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# 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>
# 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 mediawiki.dereckson.be;
include includes/letsencrypt;
return 301 https://mediawiki.dereckson.be$request_uri;
}
server {
server_name mediawiki.dereckson.be;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/mediawiki.dereckson.be/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/mediawiki.dereckson.be/privkey.pem;
error_log /var/log/www/dereckson.be/mediawiki-error.log;
access_log /var/log/www/dereckson.be/mediawiki-access.log;
root /var/51-wwwroot/mediawiki-dereckson/core;
index index.html index.php;
location / {
try_files $uri $uri/ /index.php?$query_string;
}
location /images {
alias /var/dataroot/$server_name/images;
}
location ~ ^/images/thumb/(archive/)?[0-9a-f]/[0-9a-f][0-9a-f]/([^/]+)/([0-9]+)px-.*$ {
#Note: this doesn't work with InstantCommons.
if (!-f $request_filename) {
rewrite ^/images/thumb/[0-9a-f]/[0-9a-f][0-9a-f]/([^/]+)/([0-9]+)px-.*$ /thumb.php?f=$1&width=$2;
rewrite ^/images/thumb/archive/[0-9a-f]/[0-9a-f][0-9a-f]/([^/]+)/([0-9]+)px-.*$ /thumb.php?f=$1&width=$2&archived=1;
}
}
location /images/deleted { deny all; }
location /cache { deny all; }
location /languages { deny all; }
location /maintenance { deny all; }
location /serialized { deny all; }
location ~ /.(svn|git)(/|$) { deny all; }
location ~ /.ht { deny all; }
location /mw-config { deny all; }
location ~ \.php$ {
try_files $uri =404;
fastcgi_pass unix:/var/run/web/mediawiki.dereckson.be/php-fpm.sock;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
include includes/fastcgi_params;
}
}
diff --git a/roles/webserver-legacy/nginx/files/vhosts/dereckson.be/scherzo.conf b/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/scherzo.conf
similarity index 94%
rename from roles/webserver-legacy/nginx/files/vhosts/dereckson.be/scherzo.conf
rename to roles/webserver-alkane/nginx/files/vhosts/dereckson.be/scherzo.conf
index dcb452b..5d00d0d 100644
--- a/roles/webserver-legacy/nginx/files/vhosts/dereckson.be/scherzo.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/scherzo.conf
@@ -1,37 +1,37 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# 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>
# 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 scherzo.dereckson.be;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/scherzo.dereckson.be/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/scherzo.dereckson.be/privkey.pem;
error_log /var/log/www/dereckson.be/scherzo-error.log;
access_log /var/log/www/dereckson.be/scherzo-access.log;
root /var/wwwroot/dereckson.be/scherzo;
include includes/letsencrypt;
location /doc/apps {
alias /usr/local/share/doc;
autoindex on;
default_type text/plain;
}
}
diff --git a/roles/webserver-legacy/nginx/files/vhosts/dereckson.be/www.conf b/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/www.conf
similarity index 98%
rename from roles/webserver-legacy/nginx/files/vhosts/dereckson.be/www.conf
rename to roles/webserver-alkane/nginx/files/vhosts/dereckson.be/www.conf
index 7c4e39f..e5aed6f 100644
--- a/roles/webserver-legacy/nginx/files/vhosts/dereckson.be/www.conf
+++ b/roles/webserver-alkane/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
+# 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
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 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/cosmo.conf b/roles/webserver-alkane/nginx/files/vhosts/espace-win.org/cosmo.conf
similarity index 95%
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
index 31e75b9..f9d4d83 100644
--- a/roles/webserver-legacy/nginx/files/vhosts/espace-win.org/cosmo.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/espace-win.org/cosmo.conf
@@ -1,48 +1,48 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# 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>
# 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>
# -------------------------------------------------------------
# Main site
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
server {
server_name cosmo.espace-win.org;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/cosmo.espace-win.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/cosmo.espace-win.org/privkey.pem;
include includes/letsencrypt;
error_log /var/log/www/espace-win.org/cosmo-error.log;
access_log /var/log/www/espace-win.org/cosmo-access.log;
include includes/mediawiki-root;
}
# -------------------------------------------------------------
# Redirect to HTTPS
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
server {
listen 80;
listen [::]:80;
server_name cosmo.espace-win.org;
include includes/letsencrypt;
return 301 https://cosmo.espace-win.org$request_uri;
}
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
similarity index 97%
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
index 8b68b73..c6a37f5 100644
--- a/roles/webserver-legacy/nginx/files/vhosts/espace-win.org/www.conf
+++ b/roles/webserver-alkane/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
+# Source file: roles/webserver-alkane/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 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;
}
diff --git a/roles/webserver-legacy/nginx/files/vhosts/hypership.space/www.conf b/roles/webserver-alkane/nginx/files/vhosts/hypership.space/www.conf
similarity index 97%
rename from roles/webserver-legacy/nginx/files/vhosts/hypership.space/www.conf
rename to roles/webserver-alkane/nginx/files/vhosts/hypership.space/www.conf
index a158eb8..ae51768 100644
--- a/roles/webserver-legacy/nginx/files/vhosts/hypership.space/www.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/hypership.space/www.conf
@@ -1,103 +1,103 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# 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>
# 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>
# -------------------------------------------------------------
# Main application
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
server {
server_name hypership.space;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/hypership.space/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/hypership.space/privkey.pem;
error_log /var/log/www/hypership.space/www-error.log;
access_log /var/log/www/hypership.space/www-access.log;
location /content {
return 403;
}
location /content/users {
alias /srv/zed/content/users;
}
location /content/scenes {
alias /srv/zed/content/scenes;
location ~ \.tpl$ {
# This folder contains templates intended to be rendered,
# and not directly served.
return 403;
}
}
location / {
return 503;
}
}
# -------------------------------------------------------------
# Redirects from port 80 and alternative domains
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
server {
listen 80;
listen [::]:80;
server_name hypership.space;
include includes/letsencrypt;
location / {
return 301 https://hypership.space$request_uri;
}
}
server {
listen 80;
listen [::]:80;
server_name www.hypership.space zed.dereckson.be;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/hypership.space/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/hypership.space/privkey.pem;
include includes/letsencrypt;
location / {
return 301 https://hypership.space$request_uri;
}
}
# -------------------------------------------------------------
# Development and staging area
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
server {
listen 80;
listen [::]:80;
server_name zed51.dereckson.be;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/zed51.dereckson.be/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/zed51.dereckson.be/privkey.pem;
include includes/letsencrypt;
location / {
return 503;
}
}
diff --git a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/api.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/api.conf
similarity index 98%
rename from roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/api.conf
rename to roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/api.conf
index e846cf1..e357d2b 100644
--- a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/api.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/api.conf
@@ -1,153 +1,153 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# 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>
# 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>
# -------------------------------------------------------------
# Back-end for API services
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
upstream docker-prod-datasources {
server {{ services["docker"]["api"] }}:19080;
}
upstream docker-prod-registry {
server {{ services["docker"]["api"] }}:20080;
}
upstream vault {
server {{ services["vault"] }}:8200;
# 2 servers should be added for HA, with a quorum for a Raft consensus
}
# -------------------------------------------------------------
# api.nasqueron.org configuration
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
server {
listen 80;
listen [::]:80;
server_name api.nasqueron.org;
return 301 https://api.nasqueron.org$request_uri;
}
server {
server_name api.nasqueron.org;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/api.nasqueron.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/api.nasqueron.org/privkey.pem;
error_log /var/log/www/nasqueron.org/api-error.log;
access_log /var/log/www/nasqueron.org/api-access.log;
root /var/wwwroot/nasqueron.org/api;
include includes/letsencrypt;
location ~ [^/]\.json(/|$) {
include includes/cors-open;
}
location /datasources {
proxy_pass http://docker-prod-datasources;
include includes/proxy;
include includes/cors-open;
}
location = /servers-log/all.json {
include includes/cors-open-no-cache;
alias /srv/api/data/servers-log-all.json;
}
location /servers-log {
# Mount the microservice to /servers-log,
# removing the URL from the document URI.
rewrite ^/servers\-log/?(.*)$ /$1 break;
fastcgi_pass unix:/var/run/web/api.nasqueron.org/php-fpm.sock;
fastcgi_param SCRIPT_FILENAME /srv/api/servers-log/src/public/index.php;
include fastcgi_params;
}
location ~ /docker/registry/?$ {
return 302 https://docs.nasqueron.org/docker-registry-api/;
}
location /docker/registry {
proxy_pass http://docker-prod-registry/;
include includes/proxy;
include includes/cors-open;
}
###
### Vault certificate information
###
location /infra/security/pki/root/crl {
proxy_pass https://vault/v1/pki_root/crl;
include includes/proxy;
}
location /infra/security/pki/vault/crl {
proxy_pass https://vault/v1/pki_vault/crl;
include includes/proxy;
}
location /infra/security/pki/root/ca {
proxy_pass https://vault/v1/pki_root/ca;
include includes/proxy;
}
location /infra/security/pki/vault/ca {
proxy_pass https://vault/v1/pki_vault/ca;
include includes/proxy;
}
}
server {
listen 80;
listen [::]:80;
server_name api51.nasqueron.org;
include includes/letsencrypt;
return 301 https://api51.nasqueron.org$request_uri;
}
server {
server_name api51.nasqueron.org;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/www51.nasqueron.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/www51.nasqueron.org/privkey.pem;
error_log /var/log/www/nasqueron.org/api51-error.log;
access_log /var/log/www/nasqueron.org/api51-access.log;
root /var/51-wwwroot/api;
include includes/letsencrypt;
location ~ [^/]\.json(/|$) {
include includes/cors-open;
}
location = /servers-log/all.json {
include includes/cors-open;
alias /tmp/servers-log-all.json;
}
}
diff --git a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/assets.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/assets.conf
similarity index 96%
rename from roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/assets.conf
rename to roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/assets.conf
index 0d2fa48..661e924 100644
--- a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/assets.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/assets.conf
@@ -1,57 +1,57 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# 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>
# 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>
# -------------------------------------------------------------
# Fonts by user-agent
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
map $http_user_agent $font_extension {
~Mozilla with-woff2;
default with-ttf;
}
# -------------------------------------------------------------
# assets.nasqueron.org
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
server {
listen 80;
listen [::]:80;
server_name assets.nasqueron.org;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/assets.nasqueron.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/assets.nasqueron.org/privkey.pem;
include includes/letsencrypt;
root /var/wwwroot/nasqueron.org/assets;
index index.html index.php index.htm;
location / {
location ~* \.(eot|otf|ttf|woff|woff2|css|js|json)$ {
add_header Access-Control-Allow-Origin *;
}
}
location /webfonts/css {
default_type text/css;
add_header Access-Control-Allow-Origin *;
add_header Assets-Font-Format $font_extension always;
try_files $uri $uri.$font_extension $uri/ =404;
}
}
diff --git a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/autoconfig.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/autoconfig.conf
similarity index 95%
rename from roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/autoconfig.conf
rename to roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/autoconfig.conf
index 1799db5..6eb3585 100644
--- a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/autoconfig.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/autoconfig.conf
@@ -1,40 +1,40 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# 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>
# 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 autoconfig.nasqueron.org;
include includes/letsencrypt;
return 301 https://autoconfig.nasqueron.org$request_uri;
}
server {
server_name autoconfig.nasqueron.org;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/autoconfig.nasqueron.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/autoconfig.nasqueron.org/privkey.pem;
error_log /var/log/www/nasqueron.org/autoconfig-error.log;
access_log /var/log/www/nasqueron.org/autoconfig-access.log;
root /var/wwwroot/nasqueron.org/autoconfig;
include includes/letsencrypt;
}
diff --git a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/daeghrefn.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/daeghrefn.conf
similarity index 95%
rename from roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/daeghrefn.conf
rename to roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/daeghrefn.conf
index 028cdad..2562bad 100644
--- a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/daeghrefn.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/daeghrefn.conf
@@ -1,40 +1,40 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# 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>
# 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 daeghrefn.nasqueron.org xn--dghrefn-mxa.nasqueron.org;
include includes/letsencrypt;
return 301 https://daeghrefn.nasqueron.org$request_uri;
}
server {
server_name daeghrefn.nasqueron.org xn--dghrefn-mxa.nasqueron.org;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/daeghrefn.nasqueron.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/daeghrefn.nasqueron.org/privkey.pem;
error_log /var/log/www/nasqueron.org/daeghrefn-error.log;
access_log /var/log/www/nasqueron.org/daeghrefn-access.log;
root /var/wwwroot/nasqueron.org/daeghrefn;
include includes/letsencrypt;
}
diff --git a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/docker.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/docker.conf
similarity index 93%
rename from roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/docker.conf
rename to roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/docker.conf
index 4826451..afcb4d5 100644
--- a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/docker.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/docker.conf
@@ -1,31 +1,31 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# 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>
# 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 docker.nasqueron.org;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/docker.nasqueron.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/docker.nasqueron.org/privkey.pem;
include includes/letsencrypt;
root /var/wwwroot/nasqueron.org/docker;
index index.html index.php index.htm;
}
diff --git a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/docs.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/docs.conf
similarity index 94%
rename from roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/docs.conf
rename to roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/docs.conf
index 0fc1d95..274558c 100644
--- a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/docs.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/docs.conf
@@ -1,40 +1,40 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# 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>
# 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 docs.nasqueron.org;
include includes/letsencrypt;
return 301 https://docs.nasqueron.org$request_uri;
}
server {
server_name docs.nasqueron.org;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/docs.nasqueron.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/docs.nasqueron.org/privkey.pem;
error_log /var/log/www/nasqueron.org/docs-error.log;
access_log /var/log/www/nasqueron.org/docs-access.log;
root /var/wwwroot/nasqueron.org/docs;
include includes/letsencrypt;
}
diff --git a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/ftp.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/ftp.conf
similarity index 94%
rename from roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/ftp.conf
rename to roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/ftp.conf
index 206df33..15d64f5 100644
--- a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/ftp.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/ftp.conf
@@ -1,37 +1,37 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# 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>
# 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 ftp.nasqueron.org;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/ftp.nasqueron.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/ftp.nasqueron.org/privkey.pem;
include includes/letsencrypt;
root /var/wwwroot/nasqueron.org/ftp;
index index.html index.php index.htm;
location /pub {
root /usr/jails/ftp/var/ftp;
}
autoindex on;
}
diff --git a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/infra.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/infra.conf
similarity index 96%
rename from roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/infra.conf
rename to roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/infra.conf
index 3d5aea9..5435d83 100644
--- a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/infra.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/infra.conf
@@ -1,63 +1,63 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# 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>
# 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>
upstream tommy_cd {
server {{ services["docker"]["cd"] }}:24180;
}
server {
listen 80;
listen [::]:80;
server_name infra.nasqueron.org;
include includes/letsencrypt;
return 301 https://infra.nasqueron.org$request_uri;
}
server {
server_name infra.nasqueron.org;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/infra.nasqueron.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/infra.nasqueron.org/privkey.pem;
error_log /var/log/www/nasqueron.org/infra-error.log;
access_log /var/log/www/nasqueron.org/infra-access.log;
root /var/wwwroot/nasqueron.org/infra;
include includes/letsencrypt;
location = / {
return 302 https://infra.nasqueron.org/servers-log/;
}
location = /cd {
return 302 https://infra.nasqueron.org/cd/dashboard/;
}
location = /cd/ {
return 302 https://infra.nasqueron.org/cd/dashboard/;
}
location /cd/dashboard {
rewrite ^/cd/dashboard/?(.*)$ /$1 break;
proxy_pass http://tommy_cd;
include includes/proxy;
}
}
diff --git a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/join.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/join.conf
similarity index 94%
rename from roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/join.conf
rename to roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/join.conf
index a31d2ee..c750c16 100644
--- a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/join.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/join.conf
@@ -1,40 +1,40 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# 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>
# 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 join.nasqueron.org;
include includes/letsencrypt;
return 301 https://join.nasqueron.org$request_uri;
}
server {
server_name join.nasqueron.org;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/join.nasqueron.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/join.nasqueron.org/privkey.pem;
error_log /var/log/www/nasqueron.org/join-error.log;
access_log /var/log/www/nasqueron.org/join-access.log;
root /var/wwwroot/nasqueron.org/join;
include includes/letsencrypt;
}
diff --git a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/labs.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/labs.conf
similarity index 94%
rename from roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/labs.conf
rename to roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/labs.conf
index 94d34af..22e63f3 100644
--- a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/labs.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/labs.conf
@@ -1,38 +1,38 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# 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>
# 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 labs.nasqueron.org;
include includes/letsencrypt;
return 301 https://labs.nasqueron.org$request_uri;
}
server {
server_name labs.nasqueron.org;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/labs.nasqueron.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/labs.nasqueron.org/privkey.pem;
error_log /var/log/www/nasqueron.org/labs-error.log;
access_log /var/log/www/nasqueron.org/labs-access.log;
root /var/wwwroot/nasqueron.org/labs;
}
diff --git a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/launch.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/launch.conf
similarity index 95%
rename from roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/launch.conf
rename to roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/launch.conf
index 8f18219..cf19734 100644
--- a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/launch.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/launch.conf
@@ -1,40 +1,40 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# 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>
# 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 launch.nasqueron.org;
include includes/letsencrypt;
return 301 https://launch.nasqueron.org$request_uri;
}
server {
server_name launch.nasqueron.org;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/launch.nasqueron.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/launch.nasqueron.org/privkey.pem;
error_log /var/log/www/nasqueron.org/launch-error.log;
access_log /var/log/www/nasqueron.org/launch-access.log;
root /var/wwwroot/nasqueron.org/launch;
include includes/letsencrypt;
}
diff --git a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/packages.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/packages.conf
similarity index 95%
rename from roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/packages.conf
rename to roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/packages.conf
index 23cf67a..98ddfa5 100644
--- a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/packages.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/packages.conf
@@ -1,47 +1,47 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# 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>
# 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 packages.nasqueron.org;
include includes/letsencrypt;
return 301 https://packages.nasqueron.org$request_uri;
}
server {
server_name packages.nasqueron.org;
autoindex on;
default_type text/plain;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/packages.nasqueron.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/packages.nasqueron.org/privkey.pem;
error_log /var/log/www/nasqueron.org/packages-error.log;
access_log /var/log/www/nasqueron.org/packages-access.log;
root /var/wwwroot/nasqueron.org/packages;
include includes/letsencrypt;
location /freebsd {
alias /var/repo;
}
}
diff --git a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/rain.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/rain.conf
similarity index 96%
rename from roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/rain.conf
rename to roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/rain.conf
index 97093ce..03749bb 100644
--- a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/rain.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/rain.conf
@@ -1,61 +1,61 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# 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>
# 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 rain.nasqueron.org;
include includes/letsencrypt;
return 301 https://rain.nasqueron.org$request_uri;
}
server {
server_name rain.nasqueron.org;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/rain.nasqueron.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/rain.nasqueron.org/privkey.pem;
error_log /var/log/www/nasqueron.org/rain-error.log;
access_log /var/log/www/nasqueron.org/rain-access.log;
root /var/wwwroot/nasqueron.org/rain;
}
server {
listen 80;
listen [::]:80;
server_name rain51.nasqueron.org;
include includes/letsencrypt;
return 301 https://rain51.nasqueron.org$request_uri;
}
server {
server_name rain51.nasqueron.org;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/rain.nasqueron.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/rain.nasqueron.org/privkey.pem;
error_log /var/log/www/nasqueron.org/rain51-error.log;
access_log /var/log/www/nasqueron.org/rain51-access.log;
root /var/51-wwwroot/rain;
}
diff --git a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/tools51.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/tools51.conf
similarity index 96%
rename from roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/tools51.conf
rename to roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/tools51.conf
index 35343ec..399bf1e 100644
--- a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/tools51.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/tools51.conf
@@ -1,52 +1,52 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# 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>
# 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 {
# Maintained by Dereckson
# Staging area for https://tools.nasqueron.org
listen 80;
listen [::]:80;
server_name tools51.nasqueron.org;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/assets.nasqueron.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/assets.nasqueron.org/privkey.pem;
include includes/letsencrypt;
root /var/51-wwwroot/tools;
index index.html index.php index.htm;
location ~* \.(js|jpg|gif|png|svg|css|txt|eot|woff|ttf)$ {
expires 30d;
}
location = /dl.php {
include fastcgi_params;
fastcgi_param SCRIPT_FILENAME /var/51-wwwroot/tools/dl.php;
fastcgi_pass unix:/var/run/web/tools51.nasqueron.org/php-fpm.sock;
}
location / {
rewrite ^/color/screen/(.+)$ /?Topic=color-screen&Color=$1;
fastcgi_pass unix:/var/run/web/tools51.nasqueron.org/php-fpm.sock;
fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME /var/51-wwwroot/tools/index.php;
include fastcgi_params;
}
}
diff --git a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/trustspace.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/trustspace.conf
similarity index 94%
rename from roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/trustspace.conf
rename to roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/trustspace.conf
index 759ab7f..1a796a9 100644
--- a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/trustspace.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/trustspace.conf
@@ -1,31 +1,31 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# 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>
# 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 trustspace.nasqueron.org;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/trustspace.nasqueron.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/trustspace.nasqueron.org/privkey.pem;
include includes/letsencrypt;
root /var/wwwroot/nasqueron.org/trustspace;
index index.html index.php index.htm;
}
diff --git a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/www.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/www.conf
similarity index 96%
rename from roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/www.conf
rename to roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/www.conf
index 41f852a..8287703 100644
--- a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/www.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/www.conf
@@ -1,60 +1,60 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# 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>
# 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>
# -------------------------------------------------------------
# Main site
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
server {
listen 80;
listen [::]:80;
server_name www.nasqueron.org nasqueron.org;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/www.nasqueron.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/www.nasqueron.org/privkey.pem;
include includes/letsencrypt;
root /var/wwwroot/nasqueron.org/www;
index index.html index.php index.htm;
location = /sites.json {
proxy_pass https://api.nasqueron.org/sites.json;
}
}
# -------------------------------------------------------------
# Staging area
# Maintained by Dereckson
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
server {
listen 80;
listen [::]:80;
server_name www51.nasqueron.org;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/www51.nasqueron.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/www51.nasqueron.org/privkey.pem;
include includes/letsencrypt;
root /var/51-wwwroot/www;
index index.html index.php index.htm;
# We intentionally skip /sites.json, as we want to use directly in JS code api.n.o/sites.json
}
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
similarity index 100%
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
similarity index 98%
rename from roles/webserver-legacy/nginx/files/vhosts/wolfplex.org/api.conf
rename to roles/webserver-alkane/nginx/files/vhosts/wolfplex.org/api.conf
index 078a8c7..61ffaef 100644
--- a/roles/webserver-legacy/nginx/files/vhosts/wolfplex.org/api.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/wolfplex.org/api.conf
@@ -1,121 +1,121 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# 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>
# 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>
# -------------------------------------------------------------
# Production API
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
server {
server_name api.wolfplex.org;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/api.wolfplex.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/api.wolfplex.org/privkey.pem;
error_log /var/log/www/wolfplex.org/api-error.log;
access_log /var/log/www/wolfplex.org/api-access.log;
root /var/wwwroot/wolfplex.org/api;
index index.json index.php index.html;
include includes/letsencrypt;
location ~ [^/]\.json(/|$) {
include includes/cors-open;
}
location ~ \.php$ {
fastcgi_pass unix:/var/run/web/www.wolfplex.org/php-fpm.sock;
fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
include includes/fastcgi_params;
}
}
# -------------------------------------------------------------
# Staging API
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
server {
server_name api51.wolfplex.org;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/api.wolfplex.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/api.wolfplex.org/privkey.pem;
error_log /var/log/www/wolfplex.org/api51-error.log;
access_log /var/log/www/wolfplex.org/api51-access.log;
root /var/51-wwwroot/wolfplex-api;
index index.json index.php index.html;
include includes/letsencrypt;
location ~ [^/]\.json(/|$) {
include includes/cors-open;
}
location ~ \.php$ {
fastcgi_pass unix:/var/run/web/www.wolfplex.org/php-fpm.sock;
fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
include includes/fastcgi_params;
}
}
# -------------------------------------------------------------
# Redirects for http:// or .be to https://...org
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
server {
listen 80;
listen [::]:80;
server_name api.wolfplex.org api.wolfplex.be;
include includes/letsencrypt;
return 301 https://api.wolfplex.org$request_uri;
}
server {
listen 80;
listen [::]:80;
server_name api51.wolfplex.org api51.wolfplex.be;
include includes/letsencrypt;
return 301 https://api51.wolfplex.org$request_uri;
}
server {
server_name api.wolfplex.be;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/api.wolfplex.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/api.wolfplex.org/privkey.pem;
return 301 https://api.wolfplex.org$request_uri;
}
server {
server_name api51.wolfplex.be;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/api.wolfplex.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/api.wolfplex.org/privkey.pem;
return 301 https://api51.wolfplex.org$request_uri;
}
diff --git a/roles/webserver-legacy/nginx/files/vhosts/wolfplex.org/assets.conf b/roles/webserver-alkane/nginx/files/vhosts/wolfplex.org/assets.conf
similarity index 94%
rename from roles/webserver-legacy/nginx/files/vhosts/wolfplex.org/assets.conf
rename to roles/webserver-alkane/nginx/files/vhosts/wolfplex.org/assets.conf
index 322545c..a0335c0 100644
--- a/roles/webserver-legacy/nginx/files/vhosts/wolfplex.org/assets.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/wolfplex.org/assets.conf
@@ -1,31 +1,31 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# 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>
# 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 assets.wolfplex.org assets.wolfplex.be;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/assets.wolfplex.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/assets.wolfplex.org/privkey.pem;
error_log /var/log/www/wolfplex.org/assets-error.log;
access_log /var/log/www/wolfplex.org/assets-access.log;
root /var/wwwroot/wolfplex.org/assets;
include includes/letsencrypt;
}
diff --git a/roles/webserver-legacy/nginx/files/vhosts/wolfplex.org/www.conf b/roles/webserver-alkane/nginx/files/vhosts/wolfplex.org/www.conf
similarity index 98%
rename from roles/webserver-legacy/nginx/files/vhosts/wolfplex.org/www.conf
rename to roles/webserver-alkane/nginx/files/vhosts/wolfplex.org/www.conf
index 42b3824..d4f142b 100644
--- a/roles/webserver-legacy/nginx/files/vhosts/wolfplex.org/www.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/wolfplex.org/www.conf
@@ -1,115 +1,115 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# 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>
# 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>
# ---------------------------------------------------------
# Canonical site
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
server {
server_name www.wolfplex.org;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/www.wolfplex.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/www.wolfplex.org/privkey.pem;
error_log /var/log/www/wolfplex.org/www-error.log;
access_log /var/log/www/wolfplex.org/www-access.log;
root /var/wwwroot/wolfplex.org/www;
index index.html index.php;
include includes/letsencrypt;
# ---------------------------------------------------------
# Wiki
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
location / {
# Use the wiki as home page
rewrite ^/$ /wiki;
# Link to the most relevant page to present the project
rewrite /presentation/?$ /w/index.php?title=Presentation last;
# Link to the most relevant page for bulletin/news information:
rewrite /b/?$ /w/index.php?title=Bulletin:Main last;
}
include includes/mediawiki-wiki;
# ---------------------------------------------------------
# Etherpad
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
location /pad {
rewrite ^/pad/(.+)$ https://pad.wolfplex.be/p/$1 last;
}
# ---------------------------------------------------------
# Other php-fpm services
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
location ~ \.php$ {
fastcgi_pass unix:/var/run/web/www.wolfplex.org/php-fpm.sock;
fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
include includes/fastcgi_params;
}
}
# ---------------------------------------------------------
# Redirects for http:// or .be to https://...org
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
server {
listen 80;
listen [::]:80;
server_name www.wolfplex.org www.wolfplex.be;
include includes/letsencrypt;
return 301 https://www.wolfplex.org$request_uri;
}
server {
server_name www.wolfplex.be;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/www.wolfplex.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/www.wolfplex.org/privkey.pem;
include includes/letsencrypt;
location / {
return 301 https://www.wolfplex.org$request_uri;
}
}
server {
listen 80;
listen [::]:80;
server_name wiki.wolfplex.org wiki.wolfplex.be;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/www.wolfplex.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/www.wolfplex.org/privkey.pem;
include includes/letsencrypt;
location / {
return 301 https://www.wolfplex.org/wiki$request_uri;
}
}
diff --git a/roles/webserver-legacy/nginx/init.sls b/roles/webserver-alkane/nginx/init.sls
similarity index 100%
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
index 00f4f82..2002275 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
- roles/webserver-alkane/directories
- - .nginx
+ - roles/webserver-alkane/nginx
- .static-sites
- .php-sites
- .tweaks

File Metadata

Mime Type
text/x-diff
Expires
Wed, Oct 14, 20:53 (1 d, 3 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
4183196
Default Alt Text
(80 KB)

Event Timeline

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