Page MenuHomeDevCentral
Files F3785331

D3190.id8129.diff
No OneTemporary
Actions

D3190.id8129.diff
View Options

diff --git a/roles/saas-mediawiki/nginx/files/includes/mediawiki-root b/roles/saas-mediawiki/nginx/files/includes/mediawiki-root
--- a/roles/saas-mediawiki/nginx/files/includes/mediawiki-root
+++ b/roles/saas-mediawiki/nginx/files/includes/mediawiki-root
@@ -50,7 +50,7 @@
try_files $uri =404;
fastcgi_pass {{ saas.fastcgi_url }};
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
- include includes/fastcgi_params;
+ include includes/fastcgi;
}
# -------------------------------------------------------------
@@ -60,11 +60,11 @@
location = / {
fastcgi_pass {{ saas.fastcgi_url }};
fastcgi_param SCRIPT_FILENAME {{ saas.directory }}/index.php;
- include includes/fastcgi_params;
+ include includes/fastcgi;
}
location = /status {
fastcgi_pass {{ saas.fastcgi_url }};
fastcgi_param SCRIPT_FILENAME {{ saas.directory }}/index.php;
- include includes/fastcgi_params;
+ include includes/fastcgi;
}
diff --git a/roles/saas-mediawiki/nginx/files/includes/mediawiki-wiki b/roles/saas-mediawiki/nginx/files/includes/mediawiki-wiki
--- a/roles/saas-mediawiki/nginx/files/includes/mediawiki-wiki
+++ b/roles/saas-mediawiki/nginx/files/includes/mediawiki-wiki
@@ -59,7 +59,7 @@
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;
+ include includes/fastcgi;
}
}
@@ -72,5 +72,5 @@
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;
+ include includes/fastcgi;
}
diff --git a/roles/webserver-alkane/nginx/files/includes/pluton b/roles/webserver-alkane/nginx/files/includes/pluton
--- a/roles/webserver-alkane/nginx/files/includes/pluton
+++ b/roles/webserver-alkane/nginx/files/includes/pluton
@@ -26,12 +26,12 @@
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;
+ include includes/fastcgi;
}
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;
+ include includes/fastcgi;
}
diff --git a/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/mediawiki.conf b/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/mediawiki.conf
--- a/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/mediawiki.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/mediawiki.conf
@@ -65,7 +65,7 @@
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;
+ include includes/fastcgi;
}
}
diff --git a/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/www.conf b/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/www.conf
--- a/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/www.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/www.conf
@@ -46,29 +46,17 @@
}
# Wordpress
- location /blog {
- alias /srv/wordpress;
- try_files $uri $uri/ @blog;
- }
+ include includes/wordpress-standalone-subdir;
- 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;
- }
+ # DotClear - old posts contents
+ location /blog/images { alias /var/wwwroot/dereckson.be/www/Blog/images; }
+ location /Blog/images {}
- 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;
+ # 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;
}
- location /Blog { return 503; }
-
include includes/pluton;
}
diff --git a/roles/webserver-alkane/nginx/files/vhosts/hypership.space/www.conf b/roles/webserver-alkane/nginx/files/vhosts/hypership.space/www.conf
--- a/roles/webserver-alkane/nginx/files/vhosts/hypership.space/www.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/hypership.space/www.conf
@@ -27,6 +27,8 @@
error_log /var/log/www/hypership.space/www-error.log;
access_log /var/log/www/hypership.space/www-access.log;
+ root /var/wwwroot/hypership.space/www;
+
location /content {
return 403;
}
diff --git a/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/api.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/api.conf
--- a/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/api.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/api.conf
@@ -82,7 +82,7 @@
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;
+ include includes/fastcgi;
}
location ~ /docker/registry/?$ {
diff --git a/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/labs.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/labs.conf
--- a/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/labs.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/labs.conf
@@ -31,6 +31,8 @@
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;
+ include includes/letsencrypt;
+
error_log /var/log/www/nasqueron.org/labs-error.log;
access_log /var/log/www/nasqueron.org/labs-access.log;
diff --git a/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/rain.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/rain.conf
--- a/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/rain.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/rain.conf
@@ -31,6 +31,8 @@
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;
+ include includes/letsencrypt;
+
error_log /var/log/www/nasqueron.org/rain-error.log;
access_log /var/log/www/nasqueron.org/rain-access.log;
@@ -54,6 +56,8 @@
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;
+ include includes/letsencrypt;
+
error_log /var/log/www/nasqueron.org/rain51-error.log;
access_log /var/log/www/nasqueron.org/rain51-access.log;
diff --git a/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/tools51.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/tools51.conf
--- a/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/tools51.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/tools51.conf
@@ -36,7 +36,7 @@
}
location = /dl.php {
- include fastcgi_params;
+ include includes/fastcgi;
fastcgi_param SCRIPT_FILENAME /var/51-wwwroot/tools/dl.php;
fastcgi_pass unix:/var/run/web/tools51.nasqueron.org/php-fpm.sock;
}
@@ -47,6 +47,6 @@
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;
+ include includes/fastcgi;
}
}
diff --git a/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/www.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/www.conf
--- a/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/www.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/www.conf
@@ -35,4 +35,8 @@
location = /sites.json {
proxy_pass https://api.nasqueron.org/sites.json;
}
+
+ location = /software {
+ return 302 https://agora.nasqueron.org/Software;
+ }
}
diff --git a/roles/webserver-alkane/nginx/files/vhosts/wolfplex.org/api.conf b/roles/webserver-alkane/nginx/files/vhosts/wolfplex.org/api.conf
--- a/roles/webserver-alkane/nginx/files/vhosts/wolfplex.org/api.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/wolfplex.org/api.conf
@@ -41,7 +41,7 @@
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;
+ include includes/fastcgi;
}
}
@@ -72,7 +72,7 @@
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;
+ include includes/fastcgi;
}
}
diff --git a/roles/webserver-alkane/nginx/files/vhosts/wolfplex.org/www.conf b/roles/webserver-alkane/nginx/files/vhosts/wolfplex.org/www.conf
--- a/roles/webserver-alkane/nginx/files/vhosts/wolfplex.org/www.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/wolfplex.org/www.conf
@@ -66,7 +66,7 @@
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;
+ include includes/fastcgi;
}
}
diff --git a/roles/webserver-core/nginx/files/includes/fastcgi_params b/roles/webserver-core/nginx/files/includes/fastcgi
rename from roles/webserver-core/nginx/files/includes/fastcgi_params
rename to roles/webserver-core/nginx/files/includes/fastcgi
--- a/roles/webserver-core/nginx/files/includes/fastcgi_params
+++ b/roles/webserver-core/nginx/files/includes/fastcgi
@@ -4,7 +4,7 @@
# Project: Nasqueron
# Description: nginx FastCGI configuration
# License: Trivial work, not eligible for copyright.
-# Source file: roles/webserver-core/nginx/files/includes/fastcgi_params
+# Source file: roles/webserver-core/nginx/files/includes/fastcgi
# -------------------------------------------------------------
#
# <auto-generated>

File Metadata

Mime Type
text/plain
Expires
Wed, Nov 27, 08:36 (19 h, 53 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2266539
Default Alt Text
D3190.id8129.diff (10 KB)

Event Timeline

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