Merge branch 'master' of github.com:ffdo/ffdo-ansible

playbooks/group_vars/mapservers/gluon-collector.yml

@@ -1,6 +1,5 @@
 gluon_collector_http_port: 8080
 gluon_collector_http_address: "[::1]"
-gluon_collector_use_supervisor: true
 gluon_collector_receivers:
 - type: announced
   port: 21214

roles/internal/ffdo.authentication/tasks/main.yml

@@ -4,13 +4,6 @@
 - name: Ensure sudo is installed
   apt: name=sudo state=present
 
-- name: Ensure that sudo works without tty
-  lineinfile:
-    dest: "/etc/sudoers"
-    regexp: "^Defaults\\s+requiretty.*$"
-    line: "# Defaults    requiretty"
-    validate: 'visudo -cf %s'
-
 - name: Disable password based sudo for users in group sudo and enable password less sudo
   lineinfile:
     dest: "/etc/sudoers"

roles/internal/ffdo.mapserver/handlers/main.yml

@@ -1,5 +1,2 @@
 ---
 # handlers file for map-server
-
-- name: Restart supervisor
-  service: name=supervisor state=restarted

roles/internal/ffdo.mapserver/tasks/main.yml

@@ -1,16 +1,12 @@
 ---
-# tasks file for map-server
-- include_vars: "{{ ansible_os_family }}.yml"
+- name: Install systemd services
+  template: src={{item}}.service.j2 dest=/etc/systemd/system/{{item}}.service
+  with_items:
+  - alfred
+  - batadv-vis
 
-- 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
-
-- name: Ensure supervisor is started and enabled
-  service: name=supervisor state=started enabled=yes
+- name: Enable and start systemd services
+  service: name={{item}} enabled=yes state=started
+  with_items:
+  - alfred
+  - batadv-vis

roles/internal/ffdo.mapserver/templates/alfred-master.service.j2

@@ -0,0 +1,10 @@
+[Unit]
+Description=Almighty Lightweight Fact Remote Exchange Daemon - Master
+
+[Service]
+ExecStart=/usr/local/sbin/alfred -m -i alfred0
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
+

roles/internal/ffdo.mapserver/templates/batadv-vis.service.j2

@@ -0,0 +1,10 @@
+[Unit]
+Description=batman-adv visualization (vis)
+
+[Service]
+ExecStart=/usr/local/sbin/batadv-vis -s
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
+

roles/internal/ffdo.mapserver/templates/supervisor.service.j2

@@ -1,3 +0,0 @@
-[program:{{item.name}}]
-command={{item.command}}
-stdout_logfile=NONE

roles/internal/ffdo.mapserver/vars/Debian.yml

@@ -1,2 +0,0 @@
-mapserver_packages:
-- supervisor

roles/internal/ffdo.supernode/handlers/main.yml

@@ -2,11 +2,5 @@
 # handlers file for ff-supernode
 # In Ubuntu restarting the networking service causes problems.
 # So we use ifdown and ifup to enable changes
-- name: Restart supervisor
-  service: name=supervisor state=restarted
-
 - name: Reboot machine
   shell: reboot
-
-- name: Restart cron
-  service: name=cron state=restarted

roles/internal/ffdo.supernode/tasks/debian.yml

@@ -22,6 +22,3 @@
   apt: name=linux-image-amd64 default_release=wheezy-backports state=latest
   when: ansible_distribution_release == 'wheezy'
   notify: Reboot machine
-
-- name: Start and enable supervisor
-  service: name=supervisor state=started enabled=yes

roles/internal/ffdo.supernode/tasks/main.yml

@@ -20,9 +20,6 @@
   - python3
   - python3-pip
 
-- name: Start and enable supervisor
-  service: name=supervisor state=started enabled=yes
-
 - name: Install crontab to update the blacklist
   cron:
     name: Update blacklist
@@ -32,10 +29,17 @@
 - name: Install verify shell script
   template: src=fastd-blacklist.sh.j2 dest=/etc/fastd/fastd-blacklist.sh mode="u=rwx,g=rx,o=r"
 
-- name: Create supervisor services
-  template: src=supervisor.service.j2 dest=/etc/supervisor/conf.d/{{item.name}}.conf
-  with_items: "{{supervisor_services}}"
-  notify: Restart supervisor
+- name: Install systemd services
+  template: src={{item}}.service.j2 dest=/etc/systemd/system/{{item}}.service
+  with_items:
+  - alfred
+  - batadv-vis
+
+- name: Enable and start systemd services
+  service: name={{item}} enabled=yes state=started
+  with_items:
+  - alfred
+  - batadv-vis
 
 - name: Install ntp.conf
   template: src=ntp.conf.j2 dest=/etc/ntp.conf
@@ -53,4 +57,3 @@
 
 - name: Install nodeinfo cron job
   template: src=nodeinfo.cron.j2 dest=/etc/cron.d/nodeinfo
-  notify: Restart cron

roles/internal/ffdo.supernode/templates/alfred.service.j2

@@ -0,0 +1,10 @@
+[Unit]
+Description=Almighty Lightweight Fact Remote Exchange Daemon
+
+[Service]
+ExecStart=/usr/local/sbin/alfred -i alfred0
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
+

roles/internal/ffdo.supernode/templates/batadv-vis.service.j2

@@ -0,0 +1,10 @@
+[Unit]
+Description=batman-adv visualization (vis)
+
+[Service]
+ExecStart=/usr/local/sbin/batadv-vis -s
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
+

roles/internal/ffdo.supernode/templates/ntp.conf.j2

@@ -53,8 +53,8 @@ restrict 127.0.0.1
 restrict ::1
 
 # allow from ff-do-subnets
-restrict {{supernode_mesh_ipv4|ipaddr('network')}} mask {{supernode_mesh_ipv4|ipaddr('netmask')}} kod notrap nomodify nopeer noquery
-restrict {{supernode_mesh_ipv6|ipaddr('network')}} mask {{supernode_mesh_ipv6|ipaddr('netmask')}} kod notrap nomodify nopeer noquery
+restrict {{mesh_ipv4|ipaddr('network')}} mask {{mesh_ipv4|ipaddr('netmask')}} kod notrap nomodify nopeer noquery
+restrict {{mesh_ipv6|ipaddr('network')}} mask {{mesh_ipv6|ipaddr('netmask')}} kod notrap nomodify nopeer noquery
 
 # Clients from this (example!) subnet have unlimited access, but only if
 # cryptographically authenticated.

roles/internal/ffdo.supernode/vars/main.yml

@@ -1,9 +1,3 @@
 ---
 # vars file for ff-supernode
 fastd_use_rng: true
-
-supervisor_services:
-  - name: alfred
-    command: /usr/local/sbin/alfred -i alfred0
-  - name: batadv-vis
-    command: /usr/local/sbin/batadv-vis -s

roles/internal/ffmap-backend/handlers/main.yml

@@ -1,5 +1,2 @@
 ---
 # handlers file for ffmap-backend
-
-- name: Restart cron
-  service: name=cron state=restarted

roles/internal/ffmap-backend/tasks/main.yml

@@ -22,4 +22,3 @@
 
 - name: Add ffmap-backend cron entry
   template: src=ffmap-backend.cron.j2 dest=/etc/cron.d/ffmap-backend
-  notify: Restart cron