Page MenuHomeDevCentral
Files F3769218

D1458.id3740.diff
No OneTemporary
Actions

D1458.id3740.diff
View Options

diff --git a/roles/saas-mediawiki/nginx/files/includes/mediawiki-wiki b/roles/saas-mediawiki/nginx/files/includes/mediawiki-wiki
new file mode 100644
--- /dev/null
+++ b/roles/saas-mediawiki/nginx/files/includes/mediawiki-wiki
@@ -0,0 +1,73 @@
+# -------------------------------------------------------------
+# Webserver
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# Site: agora.nasqueron.org
+# License: Trivial work, not eligible to copyright
+# Source file: roles/saas-mediawiki/nginx/files/includes/mediawiki-wiki
+# Description: Common settings for a wiki powered by MediaWiki and served
+# by our MediaWiki SaaS, with /wiki/<title> page links.
+# -------------------------------------------------------------
+#
+# <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>
+
+# -------------------------------------------------------------
+# Requests for the wiki
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+location /wiki {
+ try_files $uri $uri/ /w/index.php?$query_string;
+}
+
+location ~ ^/w/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 ^/w/images/thumb/[0-9a-f]/[0-9a-f][0-9a-f]/([^/]+)/([0-9]+)px-.*$ /w/thumb.php?f=$1&width=$2;
+ rewrite ^/w/images/thumb/archive/[0-9a-f]/[0-9a-f][0-9a-f]/([^/]+)/([0-9]+)px-.*$ /w/thumb.php?f=$1&width=$2&archived=1;
+ }
+}
+
+location /w/images {
+ alias /var/dataroot/$server_name/images;
+}
+
+location /w/images/deleted { deny all; }
+location /w/cache { deny all; }
+location /w/languages { deny all; }
+location /w/maintenance { deny all; }
+location /w/serialized { deny all; }
+location ~ /.(svn|git)(/|$) { deny all; }
+location ~ /.ht { deny all; }
+location /w/mw-config { deny all; }
+
+location /w {
+ alias /srv/mediawiki;
+
+ location ~ ^/w/.*\.php$ {
+ root /srv/mediawiki;
+ # Prune /w e.g. /w/index.php becomes /index.php
+ rewrite ^/w(/.*\.php)$ $1 break;
+
+ try_files $uri =404;
+ fastcgi_pass unix:/var/run/web/wikis.nasqueron.org/php-fpm.sock;
+ fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+ include includes/fastcgi_params;
+ }
+}
+
+# -------------------------------------------------------------
+# Requests for the SaaS entry point
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+location = /wiki/status {
+ rewrite ^/wiki/status(/.*)?$ /status$1 break;
+
+ fastcgi_pass unix:/var/run/web/wikis.nasqueron.org/php-fpm.sock;
+ fastcgi_param SCRIPT_FILENAME /var/51-wwwroot/saas-mediawiki/index.php;
+ include includes/fastcgi_params;
+}
diff --git a/roles/webserver-legacy/nginx/files/vhosts/wolfplex.org/www.conf b/roles/webserver-legacy/nginx/files/vhosts/wolfplex.org/www.conf
new file mode 100644
--- /dev/null
+++ b/roles/webserver-legacy/nginx/files/vhosts/wolfplex.org/www.conf
@@ -0,0 +1,57 @@
+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;
+
+ location / {
+ #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;
+}
+
+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;
+
+ 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;
+
+ return 301 https://www.wolfplex.org/wiki$request_uri;
+}

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 24, 13:46 (9 h, 6 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2260267
Default Alt Text
D1458.id3740.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