Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
ffdd-server
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Git Issue Tracker
Git Issue Tracker
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Jobs
Commits
Open sidebar
Firmware-Developer
ffdd-server
Commits
763ad8ee
Verified
Commit
763ad8ee
authored
Jun 03, 2020
by
Sven enniK
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix service requirements
parent
f199cf17
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
17 deletions
+10
-17
salt/freifunk/base/bind/init.sls
salt/freifunk/base/bind/init.sls
+6
-13
salt/freifunk/base/iptables/init.sls
salt/freifunk/base/iptables/init.sls
+2
-4
salt/freifunk/base/ntp/init.sls
salt/freifunk/base/ntp/init.sls
+2
-0
No files found.
salt/freifunk/base/bind/init.sls
View file @
763ad8ee
...
...
@@ -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
View file @
763ad8ee
...
...
@@ -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
View file @
763ad8ee
...
...
@@ -18,6 +18,8 @@ ntp:
{% else %}
- file: /lib/systemd/system/ntp.service
{% endif %}
- service: S52batmand
- service: S53backbone-fastd2
{# Configuration #}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment