diff --git a/roles/archweb/defaults/main.yml b/roles/archweb/defaults/main.yml index 1b99cdf1adb523ff5699fde471d1eec39c6c524c..6894e0c56c3d482d8a9f5488f88605f827d74fc7 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 536164836bf9dab2fdc8286733f2a62ad974e3ba..bd9dc8f8e12514c21a791d80c9c2dc3969a7d501 100644 --- a/roles/archweb/templates/maintenance-nginx.d.conf.j2 +++ b/roles/archweb/templates/maintenance-nginx.d.conf.j2 @@ -15,13 +15,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; @@ -61,12 +54,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 4d0a1ada651c057f370f652ae8de7f0c6aca7137..dfae852120ea0d612e9760ab3fe047048e40a185 100644 --- a/roles/archweb/templates/nginx.d.conf.j2 +++ b/roles/archweb/templates/nginx.d.conf.j2 @@ -28,14 +28,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; @@ -85,12 +77,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;