Commit 08a77ae3 authored by Jan Alexander Steffens (heftig)'s avatar Jan Alexander Steffens (heftig)
Browse files

Merge branch 'revert-remove-nm-connectivity-check' into 'master'

Revert "Remove NM connectivity check file from al.org"

See merge request !346
parents ef314dea a842fbe7
Pipeline #6378 passed with stage
in 46 seconds
......@@ -10,6 +10,7 @@ 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'
......
......@@ -16,6 +16,13 @@ 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;
......@@ -57,6 +64,12 @@ 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;
......
......@@ -29,6 +29,14 @@ 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;
......@@ -80,6 +88,12 @@ 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;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment