diff --git a/roles/archweb/defaults/main.yml b/roles/archweb/defaults/main.yml index 0a6722b5f5f7d343a8f068547ed68f9b7976d538..3864347eb7704587266c9b2eb1f51af782b25cb0 100644 --- a/roles/archweb/defaults/main.yml +++ b/roles/archweb/defaults/main.yml @@ -10,7 +10,6 @@ archweb_domains_redirects: 'planet.archlinux.org': '/planet$request_uri' archweb_domains_templates: 'ipxe.archlinux.org': 'ipxe.archlinux.org.j2' -archweb_network_check_domain: 'www.archlinux.org' archweb_allowed_hosts: ["{{ archweb_domain }}", 'ipxe.archlinux.org'] archweb_nginx_conf: '/etc/nginx/nginx.d/archweb.conf' archweb_repository: 'https://github.com/archlinux/archweb.git' diff --git a/roles/archweb/templates/maintenance-nginx.d.conf.j2 b/roles/archweb/templates/maintenance-nginx.d.conf.j2 index 51c175611dd1dde2ecd6ddce2ba7943789ffb66f..5b5a1c4ff4109ca3ebe9e666b073380086fc887e 100644 --- a/roles/archweb/templates/maintenance-nginx.d.conf.j2 +++ b/roles/archweb/templates/maintenance-nginx.d.conf.j2 @@ -16,13 +16,6 @@ server { include snippets/letsencrypt.conf; -{% if domain == archweb_network_check_domain %} - location /check_network_status.txt { - access_log off; - add_header Cache-Control "max-age=0, must-revalidate"; - return 200 'NetworkManager is online'; - } -{% endif %} location / { access_log off; return 301 https://$server_name$request_uri; @@ -64,12 +57,6 @@ server { include snippets/letsencrypt.conf; - location /check_network_status.txt { - access_log off; - add_header Cache-Control "max-age=0, must-revalidate"; - return 200 'NetworkManager is online'; - } - location / { access_log off; return 301 https://$server_name$request_uri; diff --git a/roles/archweb/templates/nginx.d.conf.j2 b/roles/archweb/templates/nginx.d.conf.j2 index 91180a00388469ab3d9c7860b0a7adfe6e5f396a..74201a624fbfa3c6c837b329d5c578bb756ca84f 100644 --- a/roles/archweb/templates/nginx.d.conf.j2 +++ b/roles/archweb/templates/nginx.d.conf.j2 @@ -34,14 +34,6 @@ server { include snippets/letsencrypt.conf; -{% if domain['domain'] == archweb_network_check_domain %} - location /check_network_status.txt { - access_log off; - add_header Cache-Control "max-age=0, must-revalidate"; - return 200 'NetworkManager is online'; - } - -{% endif %} location /.well-known { add_header Access-Control-Allow-Origin *; return 301 https://$server_name$request_uri; @@ -93,12 +85,6 @@ server { include snippets/letsencrypt.conf; - location /check_network_status.txt { - access_log off; - add_header Cache-Control "max-age=0, must-revalidate"; - return 200 'NetworkManager is online'; - } - location / { access_log off; return 301 https://$server_name$request_uri;