From 54120314b87ed7c60875ba5f41141187de5782f8 Mon Sep 17 00:00:00 2001
From: Alexander Dietrich <alexander@dietrich.cx>
Date: Sat, 18 Feb 2017 14:57:09 +0100
Subject: [PATCH] Remove location block from listing.conf

---
 .../files/etc/nginx/include/headers_hsts.conf |  4 ++++
 .../files/etc/nginx/include/listing.conf      |  8 +++-----
 .../includes/base-static/templates/site.j2    |  6 ++++--
 .../website/updates/files/updates_common.conf |  9 ---------
 roles/website/updates/tasks/main.yml          |  6 ------
 roles/website/updates/templates/site.j2       | 20 +++++++++++++++----
 6 files changed, 27 insertions(+), 26 deletions(-)
 create mode 100644 roles/nginx/files/etc/nginx/include/headers_hsts.conf
 delete mode 100644 roles/website/updates/files/updates_common.conf

diff --git a/roles/nginx/files/etc/nginx/include/headers_hsts.conf b/roles/nginx/files/etc/nginx/include/headers_hsts.conf
new file mode 100644
index 0000000..01adcb4
--- /dev/null
+++ b/roles/nginx/files/etc/nginx/include/headers_hsts.conf
@@ -0,0 +1,4 @@
+# Header bitte nur auf "location" Ebene inkludieren:
+# https://nginx.org/en/docs/http/ngx_http_headers_module.html#add_header
+
+add_header Strict-Transport-Security max-age=31536000;
diff --git a/roles/nginx/files/etc/nginx/include/listing.conf b/roles/nginx/files/etc/nginx/include/listing.conf
index d161622..bc6ab74 100644
--- a/roles/nginx/files/etc/nginx/include/listing.conf
+++ b/roles/nginx/files/etc/nginx/include/listing.conf
@@ -1,5 +1,3 @@
-location / {
-    autoindex on;
-    autoindex_exact_size on;
-    autoindex_localtime off;
-}
+autoindex on;
+autoindex_exact_size on;
+autoindex_localtime off;
diff --git a/roles/website/includes/base-static/templates/site.j2 b/roles/website/includes/base-static/templates/site.j2
index fbff97a..9d9d83a 100644
--- a/roles/website/includes/base-static/templates/site.j2
+++ b/roles/website/includes/base-static/templates/site.j2
@@ -4,10 +4,12 @@ server {
     include /etc/nginx/include/no_dotfiles.conf;
     include /etc/nginx/include/no_symlinks.conf;
 
-    {% if listing %}
+{% if listing %}
+    location / {
         include /etc/nginx/include/listing.conf;
-    {% endif %}
+    }
 
+{% endif %}
     listen {{port.number}}{% if port.ssl %} ssl{% endif %};
     listen [::]:{{port.number}}{% if port.ssl %} ssl{% endif %};
 
diff --git a/roles/website/updates/files/updates_common.conf b/roles/website/updates/files/updates_common.conf
deleted file mode 100644
index 9096f27..0000000
--- a/roles/website/updates/files/updates_common.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# Basis-Konfiguration für updates.
-
-root /var/www/updates;
-
-location / {
-    access_log off;
-    log_not_found off;
-    autoindex on;
-}
diff --git a/roles/website/updates/tasks/main.yml b/roles/website/updates/tasks/main.yml
index 577f5f1..798c645 100644
--- a/roles/website/updates/tasks/main.yml
+++ b/roles/website/updates/tasks/main.yml
@@ -1,10 +1,4 @@
 ---
-- name: copy updates_common.conf
-  copy:
-    src: files/updates_common.conf
-    dest: /etc/nginx/include
-  notify: reload nginx
-
 - 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 68108f2..2faf870 100644
--- a/roles/website/updates/templates/site.j2
+++ b/roles/website/updates/templates/site.j2
@@ -7,18 +7,26 @@ server {
     ssl_certificate {{ updates_ssl_certificate }};
     ssl_certificate_key {{ updates_ssl_certificate_key }};
 
-    include /etc/nginx/include/updates_common.conf;
+    root /var/www/updates;
+
+    location / {
+        include /etc/nginx/include/headers_hsts.conf;
+        include /etc/nginx/include/listing.conf;
+    }
 }
 
+# Kein HTTPS Redirect wg. Paketinstallation auf Routern
 server {
     listen 80;
     listen [::]:80;
 
     server_name updates.hamburg.freifunk.net;
 
-    include /etc/nginx/include/updates_common.conf;
+    root /var/www/updates;
 
-    # Kein HTTPS Redirect wg. Paketinstallation auf Routern
+    location / {
+        include /etc/nginx/include/listing.conf;
+    }
 }
 
 server {
@@ -27,5 +35,9 @@ server {
 
     server_name 1.updates.services.ffhh;
 
-    include /etc/nginx/include/updates_common.conf;
+    root /var/www/updates;
+
+    location / {
+        include /etc/nginx/include/listing.conf;
+    }
 }