freifunk/ansible-config
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update updates role

Browse source
This commit is contained in:
Alexander Dietrich 2017-11-04 16:54:59 +01:00
commit 1eac320d75
4 changed files with 15 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

27
roles/website/updates/templates/site.j2
View file

@ -11,14 +11,11 @@ server {
ssl_certificate_key {{ updates_ssl_certificate_key }};
root {{ updates_root }};
if ($ffhh-sued) {
rewrite ^/(beta|experimental|stable)/(.*)$ /ffhh-sued/$1/$2;
}
include /etc/nginx/include/updates_domains.conf;
include /etc/nginx/include/listing.conf;
location / {
include /etc/nginx/include/headers_hsts.conf;
include /etc/nginx/include/listing.conf;
}
location = /config {
@ -37,14 +34,8 @@ server {
server_name updates.hamburg.freifunk.net;
root {{ updates_root }};
if ($ffhh-sued) {
rewrite ^/(beta|experimental|stable)/(.*)$ /ffhh-sued/$1/$2;
}
location / {
include /etc/nginx/include/listing.conf;
}
include /etc/nginx/include/updates_domains.conf;
include /etc/nginx/include/listing.conf;
{% if updates_letsencrypt_local %}
include /etc/nginx/include/letsencrypt.conf;
@ -66,12 +57,6 @@ server {
server_name *.updates.services.ffhh;
root {{ updates_root }};
if ($ffhh-sued) {
rewrite ^/(beta|experimental|stable)/(.*)$ /ffhh-sued/$1/$2;
}
location / {
include /etc/nginx/include/listing.conf;
}
include /etc/nginx/include/updates_domains.conf;
include /etc/nginx/include/listing.conf;
}