Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Arch Linux
infrastructure
Commits
b83def34
Commit
b83def34
authored
Apr 07, 2021
by
Jelle van der Waa
🚧
Browse files
Merge branch 'remove-nm-connectivity-check' into 'master'
Remove NM connectivity check file from al.org See merge request
!312
parents
197145bc
b909fa58
Pipeline
#6328
passed with stage
in 47 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
roles/archweb/defaults/main.yml
View file @
b83def34
...
@@ -10,7 +10,6 @@ archweb_domains_redirects:
...
@@ -10,7 +10,6 @@ archweb_domains_redirects:
'
planet.archlinux.org'
:
'
/planet$request_uri'
'
planet.archlinux.org'
:
'
/planet$request_uri'
archweb_domains_templates
:
archweb_domains_templates
:
'
ipxe.archlinux.org'
:
'
ipxe.archlinux.org.j2'
'
ipxe.archlinux.org'
:
'
ipxe.archlinux.org.j2'
archweb_network_check_domain
:
'
www.archlinux.org'
archweb_allowed_hosts
:
[
"
{{
archweb_domain
}}"
,
'
ipxe.archlinux.org'
]
archweb_allowed_hosts
:
[
"
{{
archweb_domain
}}"
,
'
ipxe.archlinux.org'
]
archweb_nginx_conf
:
'
/etc/nginx/nginx.d/archweb.conf'
archweb_nginx_conf
:
'
/etc/nginx/nginx.d/archweb.conf'
archweb_repository
:
'
https://github.com/archlinux/archweb.git'
archweb_repository
:
'
https://github.com/archlinux/archweb.git'
...
...
roles/archweb/templates/maintenance-nginx.d.conf.j2
View file @
b83def34
...
@@ -15,13 +15,6 @@ server {
...
@@ -15,13 +15,6 @@ server {
include snippets/letsencrypt.conf;
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 / {
location / {
access_log off;
access_log off;
return 301 https://$server_name$request_uri;
return 301 https://$server_name$request_uri;
...
@@ -61,12 +54,6 @@ server {
...
@@ -61,12 +54,6 @@ server {
include snippets/letsencrypt.conf;
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 / {
location / {
access_log off;
access_log off;
return 301 https://$server_name$request_uri;
return 301 https://$server_name$request_uri;
...
...
roles/archweb/templates/nginx.d.conf.j2
View file @
b83def34
...
@@ -28,14 +28,6 @@ server {
...
@@ -28,14 +28,6 @@ server {
include snippets/letsencrypt.conf;
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 {
location /.well-known {
add_header Access-Control-Allow-Origin *;
add_header Access-Control-Allow-Origin *;
return 301 https://$server_name$request_uri;
return 301 https://$server_name$request_uri;
...
@@ -85,12 +77,6 @@ server {
...
@@ -85,12 +77,6 @@ server {
include snippets/letsencrypt.conf;
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 / {
location / {
access_log off;
access_log off;
return 301 https://$server_name$request_uri;
return 301 https://$server_name$request_uri;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment