From 54e3929b26f4af33dd5668cbb4a912f88a8dac6b Mon Sep 17 00:00:00 2001
From: Kristian Klausen <kristian@klausen.dk>
Date: Fri, 9 Apr 2021 16:33:39 +0200
Subject: [PATCH] Revert "Revert "Remove NM connectivity check file from
al.org""
We did the revert to help a small business, but they had some time to
fix their setup, so we can revert the revert.
This reverts commit a842fbe704a559e0f98a5fc09df405ed79cc4611.
---
roles/archweb/defaults/main.yml | 1 -
.../archweb/templates/maintenance-nginx.d.conf.j2 | 13 -------------
roles/archweb/templates/nginx.d.conf.j2 | 14 --------------
3 files changed, 28 deletions(-)
diff --git a/roles/archweb/defaults/main.yml b/roles/archweb/defaults/main.yml
index 0a6722b5f..3864347eb 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 51c175611..5b5a1c4ff 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 91180a003..74201a624 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;
--
GitLab