Migrate to systemd timers

roles/icvpn/tasks/bird.yml

@@ -14,7 +14,20 @@
 - name: Install cronjob to automatically update bgp bird configurations
   template:
     src: icvpn-update
-    dest: /etc/cron.hourly/icvpn-update
+    dest: /usr/local/bin/icvpn-update
     mode: 0755
     owner: root
     group: root
+
+- name: Install timer
+  import_role:
+    name: timer
+  vars:
+    timer_name: icvpn-update
+    timer_exec: /usr/local/bin/icvpn-update
+    timer_interval: 1hour
+
+- name: Remove legacy cronjob
+  file:
+    path: /etc/cron.hourly/icvpn-update
+    state: absent

roles/mesh-announce/tasks/main.yml

@@ -27,15 +27,20 @@
     name: respondd
     enabled: yes
 
-- name: Install cronjob to automatically update alfred announce
-  template:
-    src: cronjob
-    dest: /etc/cron.d/mesh-announce-alfred
-    mode: 0644
-    owner: root
-    group: root
+- name: Install timer
+  import_role:
+    name: timer
+  vars:
+    timer_name: mesh-announce
+    timer_exec: "/opt/{{ site_code }}/mesh-announce/announce.sh -i {{ alfred_mtu_interface if alfred_master else main_bridge }} -b {{ batman_interface }}"
+    timer_interval: 1min
   when: mesh_announce_alfred
 
+- name: Remove legacy cronjob
+  file:
+    path: /etc/cron.d/mesh-announce-alfred
+    state: absent
+
 - name: Open firewall for respondd
   template:
     src: firewall.sh

roles/meshviewer/tasks/geojson.yml

@@ -14,10 +14,15 @@
     group: root
     mode: 0755
 
-- name: Install cronjob to copy valide geojson
-  template:
-    src: geojson.cronjob
-    dest: /etc/cron.d/geojson-update
-    owner: root
-    group: root
-    mode: 0644
+- name: Install timer
+  import_role:
+    name: timer
+  vars:
+    timer_name: geojson-update
+    timer_exec: /usr/local/bin/geojson-update
+    timer_interval: 5min
+
+- name: Remove legacy cronjob
+  file:
+    path: /etc/cron.d/geojson-update
+    state: absent

roles/nsd/files/cronjob → roles/nsd/files/zonegen-all

@@ -29,4 +29,4 @@
     --nserver dns.bremen.freifunk.net ns2.afraid.org ns2.he.net \
     --file=/var/lib/nsd/0.b.a.b.b.b.f.f.2.8.7.8.6.0.a.2.ip6.arpa.zone --reverse nodes.ffhb.de. || exit
 
-nsd-control reload > /dev/null
+nsd-control reload

roles/nsd/tasks/main.yml

@@ -29,26 +29,35 @@
     owner: root
     group: root
 
+- name: Copy zone files
+  command: /usr/local/sbin/update-dns-zones.sh
+
 - name: Install script to generate nodes zone
   copy:
-    src: zonegen.py
-    dest: /usr/local/bin/zonegen.py
-    mode: 0755
+    src: "{{ item }}"
+    dest: /usr/local/bin/
     owner: root
     group: root
-
-- name: Install cronjob to generate nodes zone
-  copy:
-    src: cronjob
-    dest: /etc/cron.hourly/zonegen
     mode: 0755
-    owner: root
-    group: root
+  with_items:
+  - zonegen.py
+  - zonegen-all
+
+- name: Install timer
+  import_role:
+    name: timer
+  vars:
+    timer_name: zonegen
+    timer_exec: /usr/local/bin/zonegen-all
+    timer_interval: 60min
+
+- name: Remove legacy cronjob
+  file:
+    path: /etc/cron.hourly/zonegen
+    state: absent
 
 - name: Initially generate nodes zone
-  command:
-    cmd: /etc/cron.hourly/zonegen
-    creates: /var/lib/nsd/nodes.bremen.freifunk.net.zone
+  service: name=zonegen.service state=started
 
 - name: Open firewall for DNS
   copy:

roles/timer/defaults/main.yml

@@ -0,0 +1,8 @@
+timer_name:
+timer_descr: "{{ timer_name }} Timer"
+timer_exec: /bin/false
+timer_user: root
+timer_interval:
+timer_calendar: false
+timer_randomized_delay:
+timer_startup_delay: 60

roles/timer/handlers/main.yml

@@ -0,0 +1,4 @@
+---
+- name: reload systemd
+  systemd:
+    daemon_reload: yes

roles/timer/tasks/main.yml

@@ -0,0 +1,19 @@
+---
+- name: Fail when timer_name is empty
+  fail: msg="timer_name is empty"
+  when: not timer_name
+
+- name: Upload service and timer
+  template:
+    src: "job.{{ item }}"
+    dest: "/etc/systemd/system/{{ timer_name }}.{{ item }}"
+  with_items:
+  - service
+  - timer
+  notify: reload systemd
+
+- name: Enable and start timer
+  service:
+    name: "{{ timer_name }}.timer"
+    enabled: yes
+    state: started

roles/timer/templates/service

@@ -0,0 +1,10 @@
+# {{ ansible_managed }}
+
+[Unit]
+Description={{ timer_descr }}
+
+[Service]
+Type=oneshot
+User={{ timer_user }}
+
+ExecStart={{ timer_exec }}

roles/timer/templates/timer

@@ -0,0 +1,20 @@
+# {{ ansible_managed }}
+
+[Unit]
+Description={{ timer_name }} Service
+
+[Timer]
+Unit={{ timer_name }}.service
+{% if timer_calendar %}
+OnCalendar={{ timer_calendar }}
+{% else %}
+OnBootSec={{ timer_startup_delay }}
+OnUnitInactiveSec={{ timer_interval }}
+{% endif %}
+
+{% if timer_randomized_delay %}
+RandomizedDelaySec={{ timer_randomized_delay }}
+{% endif %}
+
+[Install]
+WantedBy=basic.target