fix service requirements

salt/freifunk/base/bind/init.sls

@@ -26,22 +26,16 @@ bind:
 {% if nodeid == '3' %}
       - file: /etc/bind/zones
 {% endif %}
+{# ALL DNS server #}
     - require:
-      - pkg: bind
-      - service: S40network
-      - service: S41firewall
-      - file: /lib/systemd/system/bind9.service
-      - file: /etc/bind/named.conf
-      - file: /etc/bind/named.conf.options
       - file: /etc/bind/named.conf.local
-      - file: /etc/bind/named.conf.default-zones
-      - file: /var/log/named
-      - /etc/bind/db.root
-      - bind_reload_daemon
-{# Default GW Server #}
 {% else %}
+{# Default GW Server #}
       - file: /etc/bind/vpn.forwarder
     - require:
+      - file: /etc/bind/vpn.forwarder
+{% endif %}
+{# ALL #}
       - pkg: bind
       - service: S40network
       - service: S41firewall
@@ -49,11 +43,10 @@ bind:
       - file: /etc/bind/named.conf
       - file: /etc/bind/named.conf.options
       - file: /etc/bind/named.conf.default-zones
-      - file: /etc/bind/vpn.forwarder
       - file: /var/log/named
       - /etc/bind/db.root
       - bind_reload_daemon
-{% endif %}
+      - sls: ddmesh.autoconfig
 
 
 /lib/systemd/system/bind9.service:

salt/freifunk/base/iptables/init.sls

@@ -43,14 +43,13 @@ S41firewall:
     - require:
       - pkg: iptables
       - service: S40network
-      - service: S52batmand
-      - service: S53backbone-fastd2
       - file: /etc/init.d/S41firewall
       - file: /etc/firewall.user
       - cmd: rc.d_S41firewall
       - file: /usr/local/bin/ddmesh-ipcalc.sh
       - sls: uci
       - file: /etc/config/ffdd
+      - sls: ddmesh.autoconfig
 
 
 {# IPv6 Firewall #}
@@ -81,10 +80,9 @@ S42firewall6:
     - require:
       - pkg: iptables
       - service: S40network
-      - service: S52batmand
-      - service: S53backbone-fastd2
       - file: /etc/init.d/S42firewall6
       - cmd: rc.d_S42firewall6
       - file: /usr/local/bin/ddmesh-ipcalc.sh
       - sls: uci
       - file: /etc/config/ffdd
+      - sls: ddmesh.autoconfig

salt/freifunk/base/ntp/init.sls

@@ -18,6 +18,8 @@ ntp:
 {% else %}
       - file: /lib/systemd/system/ntp.service
 {% endif %}
+      - service: S52batmand
+      - service: S53backbone-fastd2
 
 
 {# Configuration #}