Update website/meta role

host_vars/srv02

@@ -6,4 +6,6 @@ hopglass_frontend_tls_crt: /etc/letsencrypt/live/hopglass.hamburg.freifunk.net/f
 hopglass_frontend_tls_key: /etc/letsencrypt/live/hopglass.hamburg.freifunk.net/privkey.pem
 media_tls_crt: /etc/letsencrypt/live/media.hamburg.freifunk.net/fullchain.pem
 media_tls_key: /etc/letsencrypt/live/media.hamburg.freifunk.net/privkey.pem
+meta_tls_crt: /etc/letsencrypt/live/hamburg.freifunk.net/fullchain.pem
+meta_tls_key: /etc/letsencrypt/live/hamburg.freifunk.net/privkey.pem
 nginx_resolver: 127.0.0.1

production

@@ -16,6 +16,9 @@ srv02
 [media]
 srv02
 
+[meta]
+srv02
+
 [nginx]
 gw03-new ansible_host=gw03-new.hamburg.freifunk.net
 

roles/website/meta/defaults/main.yml

@@ -0,0 +1,3 @@
+---
+meta_root: /var/www/meta
+site: meta

roles/website/meta/handlers/main.yml

@@ -1,2 +0,0 @@
----
-- include: "{{ playbook_dir }}/roles/website/includes/base-static/handlers/main.yml"

roles/website/meta/meta/main.yml

@@ -1,4 +1,3 @@
 ---
 dependencies:
   - role: nginx
-

roles/website/meta/tasks/main.yml

@@ -1,12 +1,13 @@
 ---
-- include: "{{ playbook_dir }}/roles/website/includes/base-static/tasks/main.yml"
+- name: template site
-  vars:
+  template:
-    site: ffhh_meta
+    src: templates/site.j2
-    domains:
+    dest: /etc/nginx/sites-available/{{ site }}
-      - meta.hamburg.freifunk.net
+  notify: reload nginx
-    ports:
-      - { number: 80, ssl: false }
-      - { number: 443, ssl: true }
-    document_root: { path: /var/www/ffhh/meta, create: true }
-    listing: true
 
+- name: enable site
+  file:
+    src: ../sites-available/{{ site }}
+    dest: /etc/nginx/sites-enabled/{{ site }}
+    state: link
+  notify: reload nginx

roles/website/meta/templates/site.j2

@@ -0,0 +1,30 @@
+{% if meta_tls_crt is defined %}
+server {
+    server_name meta.hamburg.freifunk.net;
+    listen 443 ssl;
+    listen [::]:443 ssl;
+    ssl_certificate {{ meta_tls_crt }};
+    ssl_certificate_key {{ meta_tls_key }};
+
+    root {{ meta_root }};
+    include snippets/autoindex.conf;
+    include snippets/header-hsts.conf;
+    include snippets/no-unsafe-files.conf;
+
+    location ~ \.php$ {
+        fastcgi_pass unix:/var/run/php5-fpm.sock;
+        fastcgi_param SCRIPT_FILENAME /var/www/meta$fastcgi_script_name;
+        include fastcgi_params;
+    }
+}
+
+{% endif %}
+server {
+    server_name meta.hamburg.freifunk.net;
+    listen 80;
+    listen [::]:80;
+
+    return 302 https://$server_name$request_uri;
+
+    include snippets/location-acme.conf;
+}

services.yml

@@ -12,6 +12,11 @@
     - website/media
   tags: media
 
+- hosts: meta
+  roles:
+    - website/meta
+  tags: meta
+
 - hosts: updates
   roles:
     - website/updates