meta.hamburg.freifunk.net und Umstrukturierung

roles/website/includes/base-static/tasks/main.yml

@@ -12,6 +12,14 @@
     - website
     - "{{ site }}"
 
+- name: create {{ site }} root
+  file: path={{ document_root.path }} state=directory owner=www-data group=www-data mode=0755
+  when: document_root.create
+  tags:
+    - nginx
+    - website
+    - "{{ site }}"
+
 - name: enable {{ site }} site
   file: >
     src=/etc/nginx/sites-available/{{ site }}

roles/website/includes/base-static/templates/site.j2

@@ -1,3 +1,4 @@
+{% for port in ports %}
 server {
     include /etc/nginx/include/no_logging.conf;
     include /etc/nginx/include/no_dotfiles.conf;
@@ -7,11 +8,12 @@ server {
         include /etc/nginx/include/listing.conf;
     {% endif %}
 
-    listen 80;
-    listen [::]:80;
+    listen {{port.number}}{% if port.ssl %} ssl{% endif %};
+    listen [::]:{{port.number}}{% if port.ssl %} ssl{% endif %};
 
     server_name {{ domains | join(" ") }};
 
-    root {{ document_root }};
+    root {{ document_root.path }};
 }
 
+{% endfor %}