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

roles/external/dereulenspiegel.alfred-json/meta/.galaxy_install_info

@@ -1 +1 @@
-{install_date: 'Wed Dec 30 00:01:19 2015', version: v1.0}
+{install_date: 'Wed Dec 30 00:33:14 2015', version: v1.0}

roles/external/dereulenspiegel.alfred/meta/.galaxy_install_info

@@ -1 +1 @@
-{install_date: 'Wed Dec 30 00:01:15 2015', version: v1.3}
+{install_date: 'Wed Dec 30 00:33:10 2015', version: v1.4}

roles/external/dereulenspiegel.alfred/tasks/main.yml

@@ -36,16 +36,22 @@
     chdir: /usr/src/alfred-{{alfred_version}}
 
 - name: Install systemd services
+  register: alfred_systemd
   template: src={{item}}.service.j2 dest=/etc/systemd/system/{{item}}.service
   with_items:
   - alfred
 
 - name: Install systemd services
+  register: alfred_systemd_vis
   when: alfred_vis is defined and alfred_vis
   template: src={{item}}.service.j2 dest=/etc/systemd/system/{{item}}.service
   with_items:
   - batadv-vis
 
+- name: Systemd daemon reload
+  when: alfred_systemd_vis|changed or alfred_systemd|changed
+  shell: systemctl daemon-reload
+
 - name: Start and enable alfred
   service: name=alfred state=started enabled=yes
 

roles/external/dereulenspiegel.fastd/meta/.galaxy_install_info

@@ -1 +1 @@
-{install_date: 'Wed Dec 30 00:01:14 2015', version: v1.0}
+{install_date: 'Wed Dec 30 00:33:09 2015', version: v1.0}

roles/external/jdauphant.nginx/meta/.galaxy_install_info

@@ -1 +1 @@
-{install_date: 'Wed Dec 30 00:01:25 2015', version: v1.9.1}
+{install_date: 'Wed Dec 30 00:33:19 2015', version: v1.9.1}

roles/external/usermanage/meta/.galaxy_install_info

@@ -1 +1 @@
-{install_date: 'Wed Dec 30 00:01:09 2015', version: v1.4.1}
+{install_date: 'Wed Dec 30 00:33:04 2015', version: v1.4.1}

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

@@ -18,5 +18,6 @@ galaxy_info:
   - system
   - web
 dependencies:
+- dereulenspiegel.alfred
 - ffdo.mapserver-nginx
 - ffdo.meshviewer

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

@@ -1,12 +1 @@
 ---
-- 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

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

@@ -1,10 +0,0 @@
-[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

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

roles/thirdparty_roles.yml

@@ -6,7 +6,7 @@
 
 - src: https://github.com/dereulenspiegel/ansible-alfred.git
   name: dereulenspiegel.alfred
-  version: v1.3
+  version: v1.4
 
 - src: dereulenspiegel.alfred-json