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

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

@@ -1 +1 @@
-{install_date: 'Sat Dec 19 23:08:31 2015', version: v1.0}
+{install_date: 'Wed Dec 30 00:01:19 2015', version: v1.0}

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

@@ -1,7 +1,7 @@
 ---
 # defaults file for alfred
 alfred_version: 2015.0
-alfred_source_url: http://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-{{alfred_version}}.tar.gz
+alfred_source_url: https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-{{alfred_version}}.tar.gz
 alfred_gps: true
 alfred_vis: true
 alfred_batman_interface: bat0

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

@@ -1 +1 @@
-{install_date: 'Sat Dec 19 23:08:26 2015', version: v1.1}
+{install_date: 'Wed Dec 30 00:01:15 2015', version: v1.3}

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

@@ -5,9 +5,12 @@
   when: ansible_os_family == 'Debian'
 
 - name: Download alfred source code
+  register: alfred_source_downloaded
   get_url: dest=/usr/src url={{alfred_source_url}}
 
 - name: Extract alfred source code
+  when: alfred_source_downloaded|changed
+  register: alfred_source_extracted
   unarchive: src=/usr/src/alfred-{{alfred_version}}.tar.gz dest=/usr/src copy=no
 
 - name: Copy libcap patch to src directory
@@ -27,31 +30,21 @@
   when: not alfred_vis
 
 - name: Compile and install alfred
+  when: alfred_source_extracted|changed
   shell: "make {{alfred_config_gps|default('')}} {{alfred_config_vis|default('')}} && make {{alfred_config_gps|default('')}} {{alfred_config_vis|default('')}} install"
   args:
     chdir: /usr/src/alfred-{{alfred_version}}
 
-- name: Install init script and defaults for alfred
-  template: src="{{item.src}}" dest="{{item.dest}}" mode="{{item.mode}}"
+- name: Install systemd services
+  template: src={{item}}.service.j2 dest=/etc/systemd/system/{{item}}.service
   with_items:
-  - src: alfred.init.j2
-    dest: /etc/init.d/alfred
-    mode: "u=rwx,g=r,o=r"
-  - src: alfred.default.j2
-    dest: /etc/default/alfred
-    mode: "u=rw,g=r,o=r"
-
-- name: Install init script and defaults for batadv-vis
+  - alfred
+
+- name: Install systemd services
   when: alfred_vis is defined and alfred_vis
-  template: src="{{item.src}}" dest="{{item.dest}}" mode="{{item.mode}}"
+  template: src={{item}}.service.j2 dest=/etc/systemd/system/{{item}}.service
   with_items:
-  - src: batadv-vis.init.j2
-    dest: /etc/init.d/batadv-vis
-    mode: "u=rwx,g=r,o=r"
-  - src: batadv-vis.default.j2
-    dest: /etc/default/batadv-vis
-    mode: "u=rw,g=r,o=r"
-
+  - batadv-vis
 
 - name: Start and enable alfred
   service: name=alfred state=started enabled=yes

roles/external/dereulenspiegel.alfred/templates/alfred.default.j2

@@ -1,16 +0,0 @@
-#
-# /etc/default/alfred
-#
-
-# Additional command line options
-DAEMON_OPTS="{{alfed_daemon_opts|default('')}}"
-
-# Enable master mode (0/1)
-MASTER={% if alfred_master_mode is defined and alfred_master_mode %}1{% else %}0{% endif %}
-
-# Interface for A.L.F.R.E.D. to listen on. Has to be specified.
-INTERFACE={{alfred_interface}}
-
-# Specify the batman-adv interface configured on the system (default: bat0).
-# Use 'none' to disable the batman-adv based best server selection.
-BATMANIF={{alfred_batman_interface}}

roles/external/dereulenspiegel.alfred/templates/alfred.init.j2

@@ -1,63 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          alfred
-# Required-Start:    $remote_fs $network
-# Required-Stop:     $remote_fs $network
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: A.L.F.R.E.D
-### END INIT INFO
-
-# Author: Nils Schneider <nils@nilsschneider.net>
-
-PATH=/sbin:/bin
-DESC="A.L.F.R.E.D"
-NAME=alfred
-DAEMON=/usr/local/sbin/$NAME
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-OPTIONS=""
-UMASK=0117
-
-[ -x "$DAEMON" ] || exit 0
-
-# Source defaults.
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-[ -n "$INTERFACE" ] && OPTIONS="$OPTIONS -i $INTERFACE"
-[ -n "$BATMANIF" ] && OPTIONS="$OPTIONS -b $BATMANIF"
-[ "$MASTER" = "1" ] && OPTIONS="$OPTIONS -m"
-[ -n "$DAEMON_OPTS" ] && OPTIONS="$OPTIONS $DAEMON_OPTS"
-
-. /lib/lsb/init-functions
-
-case "$1" in
-  start)
-        log_daemon_msg "Starting $DESC" "$NAME"
-        start-stop-daemon --start --quiet --pidfile "$PIDFILE" \
-                --umask $UMASK --make-pidfile \
-                --background --exec "$DAEMON" --oknodo \
-                -- $OPTIONS
-        log_end_msg $?
-        ;;
-  stop)
-        log_daemon_msg "Stopping $DESC" "$NAME"
-        start-stop-daemon --stop --quiet --pidfile "$PIDFILE" \
-                --retry 1 --oknodo
-        log_end_msg $?
-        ;;
-  restart|force-reload)
-        $0 stop
-        sleep 1
-        $0 start
-        ;;
-  status)
-        status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-        ;;
-  *)
-        echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|status}" >&2
-        exit 1
-        ;;
-esac
-
-exit $?

roles/external/dereulenspiegel.alfred/templates/batadv-vis.default.j2

@@ -1,6 +0,0 @@
-#
-# /etc/default/batadv-vis
-#
-
-# Specify the batman-adv interface configured on the system (default: bat0).
-BATMANIF={{alfred_batadv_vis_interface}}

roles/external/dereulenspiegel.alfred/templates/batadv-vis.init.j2

@@ -1,59 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          batadv-vis
-# Required-Start:    $remote_fs $network alfred
-# Required-Stop:     $remote_fs $network alfred
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: batadv-vis
-### END INIT INFO
-
-# Author: Nils Schneider <nils@nilsschneider.net>
-
-PATH=/sbin:/bin
-DESC="batadv-vis"
-NAME=batadv-vis
-DAEMON=/usr/local/sbin/$NAME
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-GROUP=alfred
-OPTIONS="-s"
-
-[ -x "$DAEMON" ] || exit 0
-
-# Source defaults.
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-[ -n "$BATMANIF" ] && OPTIONS="$OPTIONS -i $BATMANIF"
-
-. /lib/lsb/init-functions
-
-case "$1" in
-  start)
-        log_daemon_msg "Starting $DESC" "$NAME"
-        start-stop-daemon --start --quiet --pidfile "$PIDFILE" \
-                --make-pidfile --background \
-                --exec "$DAEMON" --oknodo -- $OPTIONS
-        log_end_msg $?
-        ;;
-  stop)
-        log_daemon_msg "Stopping $DESC" "$NAME"
-        start-stop-daemon --stop --quiet --pidfile "$PIDFILE" \
-                --retry 1 --oknodo
-        log_end_msg $?
-        ;;
-  restart|force-reload)
-        $0 stop
-        sleep 1
-        $0 start
-        ;;
-  status)
-        status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-        ;;
-  *)
-        echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|status}" >&2
-        exit 1
-        ;;
-esac
-
-exit $?

roles/external/dereulenspiegel.alfred/templates/simple_init.j2

@@ -1,63 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          alfred
-# Required-Start:    $remote_fs $network
-# Required-Stop:     $remote_fs $network
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: A.L.F.R.E.D
-### END INIT INFO
-
-# Author: Nils Schneider <nils@nilsschneider.net>
-
-PATH=/sbin:/bin
-DESC="{{item.description}}"
-NAME={{item.name}}
-DAEMON={{item.daemon_path}}$NAME
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-OPTIONS=""
-UMASK=0117
-
-[ -x "$DAEMON" ] || exit 0
-
-# Source defaults.
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-[ -n "$INTERFACE" ] && OPTIONS="$OPTIONS -i $INTERFACE"
-[ -n "$BATMANIF" ] && OPTIONS="$OPTIONS -b $BATMANIF"
-[ "$MASTER" = "1" ] && OPTIONS="$OPTIONS -m"
-[ -n "$DAEMON_OPTS" ] && OPTIONS="$OPTIONS $DAEMON_OPTS"
-
-. /lib/lsb/init-functions
-
-case "$1" in
-  start)
-        log_daemon_msg "Starting $DESC" "$NAME"
-        start-stop-daemon --start --quiet --pidfile "$PIDFILE" \
-                --umask $UMASK --make-pidfile \
-                --background --exec "$DAEMON" --oknodo \
-                -- $OPTIONS
-        log_end_msg $?
-        ;;
-  stop)
-        log_daemon_msg "Stopping $DESC" "$NAME"
-        start-stop-daemon --stop --quiet --pidfile "$PIDFILE" \
-                --retry 1 --oknodo
-        log_end_msg $?
-        ;;
-  restart|force-reload)
-        $0 stop
-        sleep 1
-        $0 start
-        ;;
-  status)
-        status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-        ;;
-  *)
-        echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|status}" >&2
-        exit 1
-        ;;
-esac
-
-exit $?

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

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

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

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

roles/external/usermanage/meta/.galaxy_install_info

@@ -1 +1 @@
-{install_date: 'Sat Dec 19 23:08:05 2015', version: v1.4.1}
+{install_date: 'Wed Dec 30 00:01:09 2015', version: v1.4.1}

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

@@ -26,18 +26,6 @@
 - 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: 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
 

roles/thirdparty_roles.yml

@@ -4,8 +4,9 @@
 
 - src: dereulenspiegel.fastd
 
-- src: dereulenspiegel.alfred
-  version: v1.1
+- src: https://github.com/dereulenspiegel/ansible-alfred.git
+  name: dereulenspiegel.alfred
+  version: v1.3
 
 - src: dereulenspiegel.alfred-json