Simplified map server roles and moved to more usage of group vars, we should avoid host vars

Makefile

@@ -16,3 +16,6 @@ check-playbooks:
 
 manage-users:
 	$(ANSIBLE) playbooks/manage-users.yml
+
+mapserver:
+	$(ANSIBLE) playbooks/mapserver.yml

playbooks/group_vars/mapservers/gluon-collector.yml

@@ -0,0 +1,7 @@
+gluon_collector_http_port: 8080
+gluon_collector_http_address: "[::1]"
+gluon_collector_use_supervisor: true
+gluon_collector_receivers:
+- type: announced
+  port: 21214
+  interface: bat0

playbooks/group_vars/mapservers/meshviewer.yml

@@ -0,0 +1,3 @@
+meshviewer_data_url: "https://map.ffdo.de/data/"
+meshviewer_site_name: Freifunk Dortmund
+meshviewer_version: v3

playbooks/group_vars/mapservers/nginx.yml

@@ -0,0 +1,29 @@
+nginx_sites:
+  default:
+  - listen 80 default_server
+  - "listen [::]:80 default_server"
+  - server_name _
+  - listen 443 ssl
+  - "listen [::]:443 ssl"
+  - "ssl_certificate /etc/nginx/ssl/wiki.ffdo.de.crt"
+  - "ssl_certificate_key /etc/nginx/ssl/wiki.ffdo.de.key"
+  - "ssl_dhparam /etc/nginx/dhparams.pem"
+  - "root /var/www"
+  - index index.html
+  - "location = / { return 302 /meshviewer/; }"
+  - location /meshviewer {
+              alias {{meshviewer_install_directory}};
+              try_files $uri $uri/ =404;
+              gzip on;
+              gzip_comp_level 2;
+              gzip_types application/json application/javascript text/css;
+              gzip_vary on;
+      }
+  - location /data {
+              proxy_pass http://127.0.0.1:8080;
+              proxy_redirect off;
+              gzip on;
+              gzip_comp_level 2;
+              gzip_types application/json;
+              gzip_vary on;
+      }

playbooks/group_vars/mapservers/ssl.yml

@@ -0,0 +1,34 @@
+mapserver_use_pregenerated_dh_params: false
+mapserver_ssl_private_key: |
+    -----BEGIN RSA PRIVATE KEY-----
+    MIICXQIBAAKBgQDFUvdXLyZGjceI3Z4UjqNrbL1Jn2F/CmCjs4a8x1FqMKaH3G/4
+    se/+soMUC140RqOnb8JrOCxpB0OdepVLDW191X2d4oiOb1fCO2uMBFJ8a1ZEHq/j
+    qLn8RY7OrJGUCMmLsLqmEU6rjAEBvkD2RPTJ8fcUaMXjlIdA05QFgUlAKQIDAQAB
+    AoGBAKSwbDNd7MoyBvlaTlfF/Orp5MoPteW8GZBHhAsHKBJC7Jq0BthAWpfvEaun
+    GUb0Nh7HDjNCvP4jy/EhoHz1hg1pFOkRUlz602qLj5h2aEqB8yW4DfUbrfq3CHpd
+    0rZXWlrIn9Ww0rr/ZGQvNywOuyIVsaDmBWsudQhv+4CSpa/JAkEA+HJCRuAFExHK
+    Lftr/8bSVajOFPmdf+vhERLuAB8r7FH2pl7H67CETKN8BdVLCOurhjSA4Iq/RRaS
+    3qSkXgD9PwJBAMtSzkXfRBPxZl7iCGHsGenOfIdLONm4/LaSBJtsqv3YgAMhMdrO
+    idwU293nKktTONUV61gzbFSbLATiuLH0IJcCQG1TojScCb+deXGIjLrOG+qT0LPM
+    L/GFs9GWmeK11Nc2LiqB1MmzMFSlMENE27L+Oclhu0CT7Z0SVOjiXG39U3MCQQCS
+    6kuIK3KqomShLNx3vT1gN0a+D/mNQODCHzJbCCNp9xVQrZyziUgOEbhpWE60TPck
+    6Yi7m7SsUc913EkutMMTAkBup3dbKPkDgl3Ujm9q/mvyJdE5ZF1QvbSSuFFPinP6
+    pQtvUENWV3NmlAuBOg4gzJ+ZSyKy93KvJ91MHNwfKMok
+    -----END RSA PRIVATE KEY-----
+
+mapserver_ssl_server_cert: |
+    -----BEGIN CERTIFICATE-----
+    MIICazCCAdQCCQDGN/3zHbvn2zANBgkqhkiG9w0BAQsFADB6MQswCQYDVQQGEwJE
+    RTEMMAoGA1UECAwDTlJXMREwDwYDVQQHDAhEb3J0bXVuZDERMA8GA1UECgwIRnJl
+    aWZ1bmsxEjAQBgNVBAsMCW1hcHNlcnZlcjEjMCEGA1UEAwwabWFwc2VydmVyLmZy
+    ZWlmdW5rLmV4YW1wbGUwHhcNMTUwODAyMTIzMjUyWhcNMTYwODAxMTIzMjUyWjB6
+    MQswCQYDVQQGEwJERTEMMAoGA1UECAwDTlJXMREwDwYDVQQHDAhEb3J0bXVuZDER
+    MA8GA1UECgwIRnJlaWZ1bmsxEjAQBgNVBAsMCW1hcHNlcnZlcjEjMCEGA1UEAwwa
+    bWFwc2VydmVyLmZyZWlmdW5rLmV4YW1wbGUwgZ8wDQYJKoZIhvcNAQEBBQADgY0A
+    MIGJAoGBAMVS91cvJkaNx4jdnhSOo2tsvUmfYX8KYKOzhrzHUWowpofcb/ix7/6y
+    gxQLXjRGo6dvwms4LGkHQ516lUsNbX3VfZ3iiI5vV8I7a4wEUnxrVkQer+OoufxF
+    js6skZQIyYuwuqYRTquMAQG+QPZE9Mnx9xRoxeOUh0DTlAWBSUApAgMBAAEwDQYJ
+    KoZIhvcNAQELBQADgYEAXjdHDXdzIrlKfk1NN9PdZVap9QrXdxko48r2fxw56EIm
+    86gQheAMJX/kVKPAXnAsvr0Deoj6iM9MhHztDyZUJ4FMSyIteGFOddEVmQ8JCJIo
+    RnAOI4YIB9+CxjXNatDlmGSHGx5i4A2dUUIU/IGPXTe17+4DznGujze/hB04r34=
+    -----END CERTIFICATE-----

playbooks/host_vars/mapserver/host.yml

@@ -40,52 +40,3 @@ supernode_interfaces:
       value: "{{supernode_local_ip|ipaddr('netmask')}}"
     - key: broadcast
       value: "{{supernode_local_ip|ipaddr('broadcast')}}"
-
-meshviewer_data_url: "https://192.168.77.29/data/"
-meshviewer_site_name: Freifunk example
-meshviewer_version: v3
-
-mapserver_use_pregenerated_dh_params: true
-mapserver_dh_params: |
-  -----BEGIN DH PARAMETERS-----
-  MIIBCAKCAQEAmWF6Vbj7fCywCna6iHb8WykMo7df73WrNmcdzpxBX+x29YMhU9zX
-  DATZ6cqLjOV0uDMqL6I0estB9TxwIEXUgOoc1KTUc91AE9YzQpH86jdE6nkw4Jjz
-  ec2TkyHJmLgods8NPw/uHvrpw84HWm/QxUT3ZOYdzTuNuGxWyJ43vCTsNrq59jOx
-  pbMETJRsP2YRNHMYwwF3V40EgN5y1X0xENstyWdPvk2aspxz10O+gD6+buSYA+xb
-  rvPG5bn/sVhi7pYBKPUMhrF8AoqGltNINkpP4dW3aQDJeIcwQ1aoE8IYp8eyv935
-  bHWReVmyfpXHEWtSHjwNbuqey40XN31qYwIBAg==
-  -----END DH PARAMETERS-----
-
-mapserver_ssl_private_key: |
-    -----BEGIN RSA PRIVATE KEY-----
-    MIICXQIBAAKBgQDFUvdXLyZGjceI3Z4UjqNrbL1Jn2F/CmCjs4a8x1FqMKaH3G/4
-    se/+soMUC140RqOnb8JrOCxpB0OdepVLDW191X2d4oiOb1fCO2uMBFJ8a1ZEHq/j
-    qLn8RY7OrJGUCMmLsLqmEU6rjAEBvkD2RPTJ8fcUaMXjlIdA05QFgUlAKQIDAQAB
-    AoGBAKSwbDNd7MoyBvlaTlfF/Orp5MoPteW8GZBHhAsHKBJC7Jq0BthAWpfvEaun
-    GUb0Nh7HDjNCvP4jy/EhoHz1hg1pFOkRUlz602qLj5h2aEqB8yW4DfUbrfq3CHpd
-    0rZXWlrIn9Ww0rr/ZGQvNywOuyIVsaDmBWsudQhv+4CSpa/JAkEA+HJCRuAFExHK
-    Lftr/8bSVajOFPmdf+vhERLuAB8r7FH2pl7H67CETKN8BdVLCOurhjSA4Iq/RRaS
-    3qSkXgD9PwJBAMtSzkXfRBPxZl7iCGHsGenOfIdLONm4/LaSBJtsqv3YgAMhMdrO
-    idwU293nKktTONUV61gzbFSbLATiuLH0IJcCQG1TojScCb+deXGIjLrOG+qT0LPM
-    L/GFs9GWmeK11Nc2LiqB1MmzMFSlMENE27L+Oclhu0CT7Z0SVOjiXG39U3MCQQCS
-    6kuIK3KqomShLNx3vT1gN0a+D/mNQODCHzJbCCNp9xVQrZyziUgOEbhpWE60TPck
-    6Yi7m7SsUc913EkutMMTAkBup3dbKPkDgl3Ujm9q/mvyJdE5ZF1QvbSSuFFPinP6
-    pQtvUENWV3NmlAuBOg4gzJ+ZSyKy93KvJ91MHNwfKMok
-    -----END RSA PRIVATE KEY-----
-
-mapserver_ssl_server_cert: |
-    -----BEGIN CERTIFICATE-----
-    MIICazCCAdQCCQDGN/3zHbvn2zANBgkqhkiG9w0BAQsFADB6MQswCQYDVQQGEwJE
-    RTEMMAoGA1UECAwDTlJXMREwDwYDVQQHDAhEb3J0bXVuZDERMA8GA1UECgwIRnJl
-    aWZ1bmsxEjAQBgNVBAsMCW1hcHNlcnZlcjEjMCEGA1UEAwwabWFwc2VydmVyLmZy
-    ZWlmdW5rLmV4YW1wbGUwHhcNMTUwODAyMTIzMjUyWhcNMTYwODAxMTIzMjUyWjB6
-    MQswCQYDVQQGEwJERTEMMAoGA1UECAwDTlJXMREwDwYDVQQHDAhEb3J0bXVuZDER
-    MA8GA1UECgwIRnJlaWZ1bmsxEjAQBgNVBAsMCW1hcHNlcnZlcjEjMCEGA1UEAwwa
-    bWFwc2VydmVyLmZyZWlmdW5rLmV4YW1wbGUwgZ8wDQYJKoZIhvcNAQEBBQADgY0A
-    MIGJAoGBAMVS91cvJkaNx4jdnhSOo2tsvUmfYX8KYKOzhrzHUWowpofcb/ix7/6y
-    gxQLXjRGo6dvwms4LGkHQ516lUsNbX3VfZ3iiI5vV8I7a4wEUnxrVkQer+OoufxF
-    js6skZQIyYuwuqYRTquMAQG+QPZE9Mnx9xRoxeOUh0DTlAWBSUApAgMBAAEwDQYJ
-    KoZIhvcNAQELBQADgYEAXjdHDXdzIrlKfk1NN9PdZVap9QrXdxko48r2fxw56EIm
-    86gQheAMJX/kVKPAXnAsvr0Deoj6iM9MhHztDyZUJ4FMSyIteGFOddEVmQ8JCJIo
-    RnAOI4YIB9+CxjXNatDlmGSHGx5i4A2dUUIU/IGPXTe17+4DznGujze/hB04r34=
-    -----END CERTIFICATE-----

playbooks/mapserver.yml

@@ -0,0 +1,4 @@
+---
+- hosts: mapservers
+  roles:
+  - map-server

roles/internal/map-server/defaults/main.yml

@@ -1,7 +1,2 @@
 ---
 # defaults file for map-server
-supervisor_services:
-  - name: alfred
-    command: /usr/local/sbin/alfred -m -i alfred0
-  - name: batadv-vis
-    command: /usr/local/sbin/batadv-vis -s

roles/internal/map-server/meta/main.yml

@@ -19,35 +19,6 @@ galaxy_info:
   - web
 dependencies:
 - batman
-- mapserver-certificates
-- role: jdauphant.nginx
-  nginx_sites:
-    default:
-    - listen 80 default_server
-    - "listen [::]:80 default_server"
-    - server_name _
-    - listen 443 ssl
-    - "listen [::]:443 ssl"
-    - "ssl_certificate /etc/nginx/ssl/wiki.ffdo.de.crt"
-    - "ssl_certificate_key /etc/nginx/ssl/wiki.ffdo.de.key"
-    - "ssl_dhparam /etc/nginx/dhparams.pem"
-    - "root /var/www"
-    - index index.html
-    - "location = / { return 302 /meshviewer/; }"
-    - location /meshviewer {
-                alias {{meshviewer_install_directory}};
-                try_files $uri $uri/ =404;
-                gzip on;
-                gzip_comp_level 2;
-                gzip_types application/json application/javascript text/css;
-                gzip_vary on;
-        }
-    - location /data {
-                alias {{ffmap_backend_data_dir}};
-                gzip on;
-                gzip_comp_level 2;
-                gzip_types application/json;
-                gzip_vary on;
-        }
+- jdauphant.nginx
 - meshviewer
 - supernode-interfaces

roles/internal/map-server/tasks/main.yml

@@ -2,11 +2,32 @@
 # tasks file for map-server
 - include_vars: "{{ ansible_os_family }}.yml"
 
+- name: Install openssl to generate DH params
+  apt: name=openssl state=present
+
+- name: Ensure nginx ssl directory exists
+  file: dest=/etc/nginx/ssl/ state=directory
+
+- name: Create private ssl key from secret var
+  copy: content="{{ mapserver_ssl_private_key }}" dest=/etc/nginx/ssl/wiki.ffdo.de.key
+
+- name: Create nginx server certificate from secret var
+  copy: content="{{ mapserver_ssl_server_cert }}" dest=/etc/nginx/ssl/wiki.ffdo.de.crt
+
+- name: Deploy pregenerated DH params
+  when: mapserver_use_pregenerated_dh_params
+  copy: content="{{mapserver_dh_params}}" dest=/etc/nginx/dhparams.pem
+
+- name: Generate strong dhparams
+  when: not mapserver_use_pregenerated_dh_params
+  shell: openssl dhparam -out /etc/nginx/dhparams.pem 4096 creates=/etc/nginx/dhparams.pem
+
 - name: Install necessary packages
   apt: name={{item}} state=present
   with_items: "{{mapserver_packages}}"
 
 - name: Create supervisor services
+  when: supervisor_services is defined
   template: src=supervisor.service.j2 dest=/etc/supervisor/conf.d/{{item.name}}.conf
   with_items: "{{supervisor_services}}"
   notify: Restart supervisor

roles/internal/mapserver-certificates/README.md

@@ -1,38 +0,0 @@
-Role Name
-=========
-
-A brief description of the role goes here.
-
-Requirements
-------------
-
-Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required.
-
-Role Variables
---------------
-
-A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well.
-
-Dependencies
-------------
-
-A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles.
-
-Example Playbook
-----------------
-
-Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
-
-    - hosts: servers
-      roles:
-         - { role: username.rolename, x: 42 }
-
-License
--------
-
-BSD
-
-Author Information
-------------------
-
-An optional section for the role authors to include contact information, or a website (HTML is not allowed).

roles/internal/mapserver-certificates/defaults/main.yml

@@ -1,3 +0,0 @@
----
-# defaults file for mapserver-certificates
-mapserver_use_pregenerated_dh_params: false

roles/internal/mapserver-certificates/handlers/main.yml

@@ -1,2 +0,0 @@
----
-# handlers file for mapserver-certificates

roles/internal/mapserver-certificates/meta/main.yml

@@ -1,139 +0,0 @@
----
-galaxy_info:
-  author: your name
-  description: 
-  company: your company (optional)
-  # If the issue tracker for your role is not on github, uncomment the
-  # next line and provide a value
-  # issue_tracker_url: http://example.com/issue/tracker
-  # Some suggested licenses:
-  # - BSD (default)
-  # - MIT
-  # - GPLv2
-  # - GPLv3
-  # - Apache
-  # - CC-BY
-  license: license (GPLv2, CC-BY, etc)
-  min_ansible_version: 1.2
-  #
-  # Below are all platforms currently available. Just uncomment
-  # the ones that apply to your role. If you don't see your 
-  # platform on this list, let us know and we'll get it added!
-  #
-  #platforms:
-  #- name: EL
-  #  versions:
-  #  - all
-  #  - 5
-  #  - 6
-  #  - 7
-  #- name: GenericUNIX
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Fedora
-  #  versions:
-  #  - all
-  #  - 16
-  #  - 17
-  #  - 18
-  #  - 19
-  #  - 20
-  #  - 21
-  #  - 22
-  #- name: Windows
-  #  versions:
-  #  - all
-  #  - 2012R2
-  #- name: SmartOS
-  #  versions:
-  #  - all
-  #  - any
-  #- name: opensuse
-  #  versions:
-  #  - all
-  #  - 12.1
-  #  - 12.2
-  #  - 12.3
-  #  - 13.1
-  #  - 13.2
-  #- name: Amazon
-  #  versions:
-  #  - all
-  #  - 2013.03
-  #  - 2013.09
-  #- name: GenericBSD
-  #  versions:
-  #  - all
-  #  - any
-  #- name: FreeBSD
-  #  versions:
-  #  - all
-  #  - 8.0
-  #  - 8.1
-  #  - 8.2
-  #  - 8.3
-  #  - 8.4
-  #  - 9.0
-  #  - 9.1
-  #  - 9.1
-  #  - 9.2
-  #- name: Ubuntu
-  #  versions:
-  #  - all
-  #  - lucid
-  #  - maverick
-  #  - natty
-  #  - oneiric
-  #  - precise
-  #  - quantal
-  #  - raring
-  #  - saucy
-  #  - trusty
-  #  - utopic
-  #  - vivid
-  #- name: SLES
-  #  versions:
-  #  - all
-  #  - 10SP3
-  #  - 10SP4
-  #  - 11
-  #  - 11SP1
-  #  - 11SP2
-  #  - 11SP3
-  #- name: GenericLinux
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Debian
-  #  versions:
-  #  - all
-  #  - etch
-  #  - jessie
-  #  - lenny
-  #  - squeeze
-  #  - wheezy
-  #
-  # Below are all categories currently available. Just as with
-  # the platforms above, uncomment those that apply to your role.
-  #
-  #categories:
-  #- cloud
-  #- cloud:ec2
-  #- cloud:gce
-  #- cloud:rax
-  #- clustering
-  #- database
-  #- database:nosql
-  #- database:sql
-  #- development
-  #- monitoring
-  #- networking
-  #- packaging
-  #- system
-  #- web
-dependencies: []
-  # List your role dependencies here, one per line.
-  # Be sure to remove the '[]' above if you add dependencies
-  # to this list.
-  

roles/internal/mapserver-certificates/tasks/main.yml

@@ -1,22 +0,0 @@
----
-# tasks file for mapserver-certificates
-
-- name: Install openssl to generate DH params
-  apt: name=openssl state=present
-
-- name: Ensure nginx ssl directory exists
-  file: dest=/etc/nginx/ssl/ state=directory
-
-- name: Create private ssl key from secret var
-  copy: content="{{ mapserver_ssl_private_key }}" dest=/etc/nginx/ssl/wiki.ffdo.de.key
-
-- name: Create nginx server certificate from secret var
-  copy: content="{{ mapserver_ssl_server_cert }}" dest=/etc/nginx/ssl/wiki.ffdo.de.crt
-
-- name: Deploy pregenerated DH params
-  when: mapserver_use_pregenerated_dh_params
-  copy: content="{{mapserver_dh_params}}" dest=/etc/nginx/dhparams.pem
-
-- name: Generate strong dhparams
-  when: not mapserver_use_pregenerated_dh_params
-  shell: openssl dhparam -out /etc/nginx/dhparams.pem 4096 creates=/etc/nginx/dhparams.pem

roles/internal/mapserver-certificates/vars/main.yml

@@ -1,2 +0,0 @@
----
-# vars file for mapserver-certificates

roles/internal/meshviewer/meta/main.yml

@@ -50,5 +50,5 @@ galaxy_info:
   - monitoring
   - web
 dependencies:
-- ffmap-backend
+- ansible-gluon-collector
 - laggyluke.nodejs