diff --git a/roles/website/updates/tasks/main.yml b/roles/website/updates/tasks/main.yml index bc32f4a..1a018d9 100644 --- a/roles/website/updates/tasks/main.yml +++ b/roles/website/updates/tasks/main.yml @@ -10,11 +10,6 @@ group: "{{ updates_group }}" state: directory -- name: copy updates_domains.conf - copy: - src: updates_domains.conf - dest: /etc/nginx/include - - name: template site template: src: templates/site.j2 diff --git a/roles/website/updates/templates/site.j2 b/roles/website/updates/templates/site.j2 index 17751dc..497baec 100644 --- a/roles/website/updates/templates/site.j2 +++ b/roles/website/updates/templates/site.j2 @@ -1,5 +1,3 @@ -include /etc/nginx/include/node_hierarchy.conf; - {% if updates_ssl_certificate is defined %} server { listen 443 ssl; @@ -11,18 +9,11 @@ server { ssl_certificate_key {{ updates_ssl_certificate_key }}; root {{ updates_root }}; - include /etc/nginx/include/updates_domains.conf; include /etc/nginx/include/listing.conf; location / { include /etc/nginx/include/headers_hsts.conf; } - - location = /config { - root /etc/nginx/include; - try_files /node_hierarchy.conf =404; - default_type text/plain; - } } {% endif %} @@ -34,7 +25,6 @@ server { server_name updates.hamburg.freifunk.net; root {{ updates_root }}; - include /etc/nginx/include/updates_domains.conf; include /etc/nginx/include/listing.conf; {% if updates_letsencrypt_local %} @@ -57,6 +47,5 @@ server { server_name *.updates.services.ffhh; root {{ updates_root }}; - include /etc/nginx/include/updates_domains.conf; include /etc/nginx/include/listing.conf; }