Page MenuHomeDevCentral
Files F3769841

No OneTemporary
Actions

View Options

diff --git a/roles/webserver-legacy/nginx/files/vhosts/wolfplex.org/www.conf b/roles/webserver-legacy/nginx/files/vhosts/wolfplex.org/www.conf
index 8f021a0..6b99054 100644
--- a/roles/webserver-legacy/nginx/files/vhosts/wolfplex.org/www.conf
+++ b/roles/webserver-legacy/nginx/files/vhosts/wolfplex.org/www.conf
@@ -1,99 +1,107 @@
# -------------------------------------------------------------
# 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
# -------------------------------------------------------------
#
# <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;
# ---------------------------------------------------------
# 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;
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/x-diff
Expires
Mon, Nov 25, 17:15 (20 h, 24 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2257384
Default Alt Text
(3 KB)

Event Timeline

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