diff --git a/roles/nginx/templates/vhosts/www.nintendojo.fr.conf.j2 b/roles/nginx/templates/vhosts/www.nintendojo.fr.conf.j2 index 5df6800..e87bee0 100644 --- a/roles/nginx/templates/vhosts/www.nintendojo.fr.conf.j2 +++ b/roles/nginx/templates/vhosts/www.nintendojo.fr.conf.j2 @@ -30,28 +30,6 @@ server { return 307 https://m.nintendojo.fr/@nintendojofr.rss; } - # Images de la v6 - location ~ ^/images/(.*)$ { - expires 2w; - alias /srv/http/archives.nintendojo.fr/v6/images/$1; - } - - # Images de la v6.7 - location ~ ^/public/(.*)$ { - expires 2w; - alias /srv/http/archives.nintendojo.fr/$1; - } - - # Zolie wallpapers - location /wallpapers { - rewrite ^/wallpapers$ /index.php/wallpapers last; - rewrite ^/wallpapers/([0-9]+) /index.php/wallpapers/?id=$1 last; - location ~ ^/wallpapers/files(.*)(/.*\.jpg)$ { - expires 1w; - alias /srv/http/www.nintendojo.fr/wp-content/plugins/dojomurpapier/files$2; - } - } - # Optimisation des images location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { expires 1w; diff --git a/roles/nginx/templates/vhosts/www.nintendojofr.com.conf.j2 b/roles/nginx/templates/vhosts/www.nintendojofr.com.conf.j2 index c7df85e..ce1fdf4 100644 --- a/roles/nginx/templates/vhosts/www.nintendojofr.com.conf.j2 +++ b/roles/nginx/templates/vhosts/www.nintendojofr.com.conf.j2 @@ -12,14 +12,14 @@ server { root /srv/http/www.nintendojofr.com/; index index.html index.htm index.php; - location ~ ^/images/(.*)$ { - return 301 https://www.nintendojo.fr/images/$1; - } - location ~ ^/forum/(.*)$ { return 301 https://forum.nintendojo.fr/$1?$args; } + location ~ ^/forum { + return 301 https://forum.nintendojo.fr/; + } + location ~ ^/(index).php(/.*)+ { fastcgi_split_path_info ^(.+\.php)(/.*)$; fastcgi_pass unix:/var/run/php/php8.2-fpm.sock;