From f77a5550c9b95789c18885bbd023a2f92757db85 Mon Sep 17 00:00:00 2001 From: VC Date: Mon, 7 Apr 2025 10:46:35 +0200 Subject: [PATCH] =?UTF-8?q?=E2=9A=B0:=20remove=20dead=20websites?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- inventory/host_vars/web2.yml | 1 - .../vhosts/analyse.nintendojo.fr.conf.j2 | 33 ------------ .../vhosts/autodiscover.libertus.eu.conf.j2 | 0 .../vhosts/forum.nintendojofr.com.conf.j2 | 1 - .../templates/vhosts/sebicomics.com.conf.j2 | 0 .../vhosts/www.nintendojofr.com.conf.j2 | 6 +-- .../vhosts/www.sebicomics.com.conf.j2 | 54 ------------------- .../vhosts/wwwdev.nintendojo.fr.conf.j2 | 46 ---------------- roles/wordpress/tasks/main.yml | 2 - roles/wordpress/tasks/wpdev_dojo.yml | 9 ---- roles/wordpress/templates/wwwdev.htpasswd.j2 | 1 - 11 files changed, 3 insertions(+), 150 deletions(-) delete mode 100644 roles/nginx/templates/vhosts/analyse.nintendojo.fr.conf.j2 delete mode 100644 roles/nginx/templates/vhosts/autodiscover.libertus.eu.conf.j2 delete mode 100644 roles/nginx/templates/vhosts/sebicomics.com.conf.j2 delete mode 100644 roles/nginx/templates/vhosts/www.sebicomics.com.conf.j2 delete mode 100644 roles/nginx/templates/vhosts/wwwdev.nintendojo.fr.conf.j2 delete mode 100644 roles/wordpress/tasks/wpdev_dojo.yml delete mode 100644 roles/wordpress/templates/wwwdev.htpasswd.j2 diff --git a/inventory/host_vars/web2.yml b/inventory/host_vars/web2.yml index 50eb2c2..63b273d 100644 --- a/inventory/host_vars/web2.yml +++ b/inventory/host_vars/web2.yml @@ -4,7 +4,6 @@ php_modules: ['opcache', 'mysql', 'mbstring', 'gd', 'intl', 'xml', 'bcmath', 'cu web_hostname: - host: nintendojo.fr - host: www.nintendojo.fr - - host: wwwdev.nintendojo.fr - host: forum.nintendojo.fr type: phpbb - host: nintendojofr.com diff --git a/roles/nginx/templates/vhosts/analyse.nintendojo.fr.conf.j2 b/roles/nginx/templates/vhosts/analyse.nintendojo.fr.conf.j2 deleted file mode 100644 index 46f715b..0000000 --- a/roles/nginx/templates/vhosts/analyse.nintendojo.fr.conf.j2 +++ /dev/null @@ -1,33 +0,0 @@ -server { -{% include './templates/header.conf.j2' %} - - root /srv/http/analyse.nintendojo.fr/; - index index.html index.htm index.php; - - location ~ ^/(status|ping|apc_info.php)$ { - access_log off; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include fastcgi_params; - fastcgi_pass unix:/var/run/php/php{{ php_version }}-fpm.sock; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - expires 2w; - log_not_found off; - } - - location ~ \.htaccess$ { - deny all; - } - - location ~ ^/tmp { - deny all; - } - - location ~ \.php$ { - try_files $uri $uri/ =404; - fastcgi_pass unix:/var/run/php/php{{ php_version }}-fpm.sock; - include fastcgi_params; - } -} - diff --git a/roles/nginx/templates/vhosts/autodiscover.libertus.eu.conf.j2 b/roles/nginx/templates/vhosts/autodiscover.libertus.eu.conf.j2 deleted file mode 100644 index e69de29..0000000 diff --git a/roles/nginx/templates/vhosts/forum.nintendojofr.com.conf.j2 b/roles/nginx/templates/vhosts/forum.nintendojofr.com.conf.j2 index 80ef0b0..f48965e 100644 --- a/roles/nginx/templates/vhosts/forum.nintendojofr.com.conf.j2 +++ b/roles/nginx/templates/vhosts/forum.nintendojofr.com.conf.j2 @@ -1,6 +1,5 @@ server { {% include './templates/header.conf.j2' %} - root /srv/http/forum.nintendojofr.com/; index index.html index.htm index.php; location / { diff --git a/roles/nginx/templates/vhosts/sebicomics.com.conf.j2 b/roles/nginx/templates/vhosts/sebicomics.com.conf.j2 deleted file mode 100644 index e69de29..0000000 diff --git a/roles/nginx/templates/vhosts/www.nintendojofr.com.conf.j2 b/roles/nginx/templates/vhosts/www.nintendojofr.com.conf.j2 index 5961ae2..e74a5be 100644 --- a/roles/nginx/templates/vhosts/www.nintendojofr.com.conf.j2 +++ b/roles/nginx/templates/vhosts/www.nintendojofr.com.conf.j2 @@ -1,13 +1,13 @@ server { listen *:443 ssl http2; listen [::]:443 ssl http2; - server_name nintendojofr.com www.nintendojofr.com; + server_name www.nintendojofr.com nintendojofr.com; access_log /var/log/nginx/nintendojofr.com.access.log combined; access_log syslog:server=unix:/dev/log combined; error_log /var/log/nginx/nintendojofr.com.error.log; error_log syslog:server=unix:/dev/log; - ssl_certificate /etc/x509/nintendojofr.com/fullchain.cer; - ssl_certificate_key /etc/x509/nintendojofr.com/nintendojofr.com.key; + ssl_certificate /etc/x509/www.nintendojofr.com/fullchain.cer; + ssl_certificate_key /etc/x509/www.nintendojofr.com/www.nintendojofr.com.key; root /var/www/www.nintendojofr.com/; index index.html index.htm index.php; diff --git a/roles/nginx/templates/vhosts/www.sebicomics.com.conf.j2 b/roles/nginx/templates/vhosts/www.sebicomics.com.conf.j2 deleted file mode 100644 index c3bb252..0000000 --- a/roles/nginx/templates/vhosts/www.sebicomics.com.conf.j2 +++ /dev/null @@ -1,54 +0,0 @@ -## WP Sebicomics -server { - listen *:443 ssl http2; - listen [::]:443 ssl http2; - server_name sebicomics.com www.sebicomics.com; - access_log /var/log/nginx/www.sebicomics.com.access.log combined; - access_log syslog:server=unix:/dev/log combined; - error_log /var/log/nginx/www.sebicomics.com.error.log; - error_log syslog:server=unix:/dev/log; - ssl_certificate /etc/x509/www.sebicomics.com/fullchain.cer; - ssl_certificate_key /etc/x509/www.sebicomics.com/www.sebicomics.com.key; - - root /srv/http/www.sebicomics.com/; - index index.html index.htm index.php; - - client_max_body_size 512M; - - # couper les fichiers cachés - location ~* /(?:uploads|files)/.*\.php$ { - deny all; - } - - # couper les fichiers textes du captcha - location ~* /wp-content/uploads/wpcf7_captcha/.*\.txt$ { - deny all; - } - - # Optimisation des images - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - expires 1w; - log_not_found off; - } - - # Interprétation PHP - location ~ ^/(index).php(/.*)+ { - fastcgi_split_path_info ^(.+\.php)(/.*)$; - try_files $fastcgi_script_name =404; - fastcgi_ignore_headers Cache-Control Expires Set-Cookie; - fastcgi_pass unix:/var/run/php/php{{ php_version }}-fpm.sock; - fastcgi_read_timeout 60; - include fastcgi_params; - } - - location ~ \.php$ { - try_files $uri $uri/ =404; - fastcgi_pass unix:/var/run/php/php{{ php_version }}-fpm.sock; - fastcgi_read_timeout 60; - include fastcgi_params; - } - - location / { - try_files $uri $uri/ /index.php$uri?$args; - } -} diff --git a/roles/nginx/templates/vhosts/wwwdev.nintendojo.fr.conf.j2 b/roles/nginx/templates/vhosts/wwwdev.nintendojo.fr.conf.j2 deleted file mode 100644 index 1cf2223..0000000 --- a/roles/nginx/templates/vhosts/wwwdev.nintendojo.fr.conf.j2 +++ /dev/null @@ -1,46 +0,0 @@ -## WP NintendojoFR -server { -{% include './templates/header.conf.j2' %} - - root /srv/http/wwwdev.nintendojo.fr/; - index index.html index.htm index.php; - auth_basic "Restricted Area"; - auth_basic_user_file /etc/nginx/wwwdev.htpasswd; - - client_max_body_size 2G; - - # couper les fichiers cachés - location ~* /(?:uploads|files)/.*\.php$ { - deny all; - } - - # couper les fichiers textes du captcha - location ~* /wp-content/uploads/wpcf7_captcha/.*\.txt$ { - deny all; - } - - # redirige twitter - location /feed/twitter { - return 307 https://m.nintendojo.fr/@nintendojofr.rss; - } - - # Interprétation PHP - location ~ ^/(index).php(/.*)+ { - fastcgi_split_path_info ^(.+\.php)(/.*)$; - try_files $fastcgi_script_name =404; - fastcgi_pass unix:/var/run/php/php{{ php_version }}-fpm.sock; - fastcgi_read_timeout 60; - include fastcgi_params; - } - - location ~ \.php$ { - try_files $uri $uri/ =404; - fastcgi_pass unix:/var/run/php/php{{ php_version }}-fpm.sock; - fastcgi_read_timeout 60; - include fastcgi_params; - } - - location / { - try_files $uri $uri/ /index.php$uri?$args; - } -} diff --git a/roles/wordpress/tasks/main.yml b/roles/wordpress/tasks/main.yml index 831c6e2..4d3e57f 100644 --- a/roles/wordpress/tasks/main.yml +++ b/roles/wordpress/tasks/main.yml @@ -4,5 +4,3 @@ ansible.builtin.include_tasks: db.yml - name: WP for NintendojoFR ansible.builtin.include_tasks: wp_dojo.yml -- name: WP dev for NintendojoFR - ansible.builtin.include_tasks: wpdev_dojo.yml diff --git a/roles/wordpress/tasks/wpdev_dojo.yml b/roles/wordpress/tasks/wpdev_dojo.yml deleted file mode 100644 index d6751a2..0000000 --- a/roles/wordpress/tasks/wpdev_dojo.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- name: Put htpasswd file - ansible.builtin.template: - src: wwwdev.htpasswd.j2 - dest: /etc/nginx/wwwdev.htpasswd - owner: www-data - group: www-data - mode: "0o600" diff --git a/roles/wordpress/templates/wwwdev.htpasswd.j2 b/roles/wordpress/templates/wwwdev.htpasswd.j2 deleted file mode 100644 index c9ec149..0000000 --- a/roles/wordpress/templates/wwwdev.htpasswd.j2 +++ /dev/null @@ -1 +0,0 @@ -editeurs:{{ webapps_htpasswd_editeurs }}