From b56b258d9164caebfc4be0d4a51f3a4824d4c0fd Mon Sep 17 00:00:00 2001
From: baldo <baldo@toppoint.de>
Date: Sun, 30 Aug 2015 17:55:05 +0200
Subject: [PATCH] meta.hamburg.freifunk.net und Umstrukturierung

---
 roles/website/ffnord/tasks/main.yml                 |  8 +++++---
 roles/website/includes/base-static/tasks/main.yml   |  8 ++++++++
 .../website/includes/base-static/templates/site.j2  |  8 +++++---
 roles/website/media/tasks/main.yml                  | 13 +++++--------
 roles/website/meta/handlers/main.yml                |  2 ++
 roles/website/meta/meta/main.yml                    |  4 ++++
 roles/website/meta/tasks/main.yml                   | 12 ++++++++++++
 services.yml                                        |  1 +
 8 files changed, 42 insertions(+), 14 deletions(-)
 create mode 100644 roles/website/meta/handlers/main.yml
 create mode 100644 roles/website/meta/meta/main.yml
 create mode 100644 roles/website/meta/tasks/main.yml

diff --git a/roles/website/ffnord/tasks/main.yml b/roles/website/ffnord/tasks/main.yml
index d6558a2..7240f53 100644
--- a/roles/website/ffnord/tasks/main.yml
+++ b/roles/website/ffnord/tasks/main.yml
@@ -1,16 +1,18 @@
 ---
 - include: ../../includes/base-static/tasks/main.yml
   vars:
-    site: ffnord.net
+    site: ffnord_site
     domains:
       - ffnord.net
       - www.ffnord.net
       - nord.freifunk.net
-    document_root: /var/www/ffnord.net/site
+    ports:
+      - { number: 80, ssl: false }
+    document_root: { path: /var/www/ffnord/site/site, create: false }
     listing: false
 
 - name: clone ffnord.net repository
-  git: repo=https://github.com/ffnord/ffnord.net.git dest=/var/www/ffnord.net
+  git: repo=https://github.com/ffnord/ffnord.net.git dest=/var/www/ffnord/site
   tags:
     - nginx
     - website
diff --git a/roles/website/includes/base-static/tasks/main.yml b/roles/website/includes/base-static/tasks/main.yml
index c5499ce..9f98f5c 100644
--- a/roles/website/includes/base-static/tasks/main.yml
+++ b/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 }}
diff --git a/roles/website/includes/base-static/templates/site.j2 b/roles/website/includes/base-static/templates/site.j2
index adc6019..fbff97a 100644
--- a/roles/website/includes/base-static/templates/site.j2
+++ b/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 %}
diff --git a/roles/website/media/tasks/main.yml b/roles/website/media/tasks/main.yml
index 1a46060..1293323 100644
--- a/roles/website/media/tasks/main.yml
+++ b/roles/website/media/tasks/main.yml
@@ -1,16 +1,13 @@
 ---
 - include: ../../includes/base-static/tasks/main.yml
   vars:
-    site: media_ffhh
+    site: ffhh_media
     domains:
       - media.services.ffhh
       - media.hamburg.freifunk.net
-    document_root: /var/www/media
+    ports:
+      - { number: 80, ssl: false }
+      - { number: 443, ssl: true }
+    document_root: { path: /var/www/ffhh/media, create: true }
     listing: true
 
-- name: create media root
-  file: path=/var/www/media state=directory owner=www-data group=www-data mode=0755
-  tags:
-    - nginx
-    - website
-    - media_ffhh
diff --git a/roles/website/meta/handlers/main.yml b/roles/website/meta/handlers/main.yml
new file mode 100644
index 0000000..857d50c
--- /dev/null
+++ b/roles/website/meta/handlers/main.yml
@@ -0,0 +1,2 @@
+---
+- include: ../../includes/base-static/handlers/main.yml
diff --git a/roles/website/meta/meta/main.yml b/roles/website/meta/meta/main.yml
new file mode 100644
index 0000000..f6688f0
--- /dev/null
+++ b/roles/website/meta/meta/main.yml
@@ -0,0 +1,4 @@
+---
+dependencies:
+  - role: nginx
+
diff --git a/roles/website/meta/tasks/main.yml b/roles/website/meta/tasks/main.yml
new file mode 100644
index 0000000..bb171ad
--- /dev/null
+++ b/roles/website/meta/tasks/main.yml
@@ -0,0 +1,12 @@
+---
+- include: ../../includes/base-static/tasks/main.yml
+  vars:
+    site: ffhh_meta
+    domains:
+      - meta.hamburg.freifunk.net
+    ports:
+      - { number: 80, ssl: false }
+      - { number: 443, ssl: true }
+    document_root: { path: /var/www/ffhh/meta, create: true }
+    listing: true
+
diff --git a/services.yml b/services.yml
index a9d547b..4bbc197 100644
--- a/services.yml
+++ b/services.yml
@@ -4,4 +4,5 @@
     - ntp-server
     - website/ffnord
     - website/media
+    - website/meta