extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-02-16 09:50:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.6.8' of ssh://server.shorewall.net/home/teastep/shorewall/code into 4.6.8

Browse Source 
Merge Tuomo Soini's fix for the .service files.
This commit is contained in:
Tom Eastep 2015-04-11 07:49:05 -07:00
commit 344697f96b
10 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Shorewall-core/lib.cli
View File

@ -4040,10 +4040,6 @@ shorewall_cli() {
[ -n "${VARDIR:=/var/lib/$g_program}" ] [ -n "${VARDIR:=/var/lib/$g_program}" ]
if [ ! -f ${VARDIR}/firewall ]; then
[ -f ${VARDIR}/.restore ] && cp -f ${VARDIR}/.rstore ${VARDIR}/firewall
fi
g_firewall=${VARDIR}/firewall g_firewall=${VARDIR}/firewall
version_file=${g_sharedir}/version version_file=${g_sharedir}/version

1
Shorewall-init/shorewall-init.service
View File

@ -6,6 +6,7 @@
[Unit] [Unit]
Description=Shorewall IPv4 firewall (bootup security) Description=Shorewall IPv4 firewall (bootup security)
Before=network.target Before=network.target
Wants=network.target
Conflicts=iptables.service firewalld.service Conflicts=iptables.service firewalld.service
[Service] [Service]

1
Shorewall-lite/shorewall-lite.service
View File

@ -5,6 +5,7 @@
# #
[Unit] [Unit]
Description=Shorewall IPv4 firewall (lite) Description=Shorewall IPv4 firewall (lite)
Wants=network-online.target
After=network-online.target After=network-online.target
Conflicts=iptables.service firewalld.service Conflicts=iptables.service firewalld.service

1
Shorewall-lite/shorewall-lite.service.214
View File

@ -5,6 +5,7 @@
# #
[Unit] [Unit]
Description=Shorewall IPv4 firewall (lite) Description=Shorewall IPv4 firewall (lite)
Wants=network-online.target
After=network-online.target After=network-online.target
Conflicts=iptables.service firewalld.service Conflicts=iptables.service firewalld.service

1
Shorewall/shorewall.service
View File

@ -5,6 +5,7 @@
# #
[Unit] [Unit]
Description=Shorewall IPv4 firewall Description=Shorewall IPv4 firewall
Wants=network-online.target
After=network-online.target After=network-online.target
Conflicts=iptables.service firewalld.service Conflicts=iptables.service firewalld.service

1
Shorewall/shorewall.service.214
View File

@ -5,6 +5,7 @@
# #
[Unit] [Unit]
Description=Shorewall IPv4 firewall Description=Shorewall IPv4 firewall
Wants=network-online.target
After=network-online.target After=network-online.target
Conflicts=iptables.service firewalld.service Conflicts=iptables.service firewalld.service

1
Shorewall6-lite/shorewall6-lite.service
View File

@ -5,6 +5,7 @@
# #
[Unit] [Unit]
Description=Shorewall IPv6 firewall (lite) Description=Shorewall IPv6 firewall (lite)
Wants=network-online.target
After=network-online.target After=network-online.target
Conflicts=ip6tables.service firewalld.service Conflicts=ip6tables.service firewalld.service

1
Shorewall6-lite/shorewall6-lite.service.214
View File

@ -5,6 +5,7 @@
# #
[Unit] [Unit]
Description=Shorewall IPv6 firewall (lite) Description=Shorewall IPv6 firewall (lite)
Wants=network-online.target
After=network-online.target After=network-online.target
Conflicts=ip6tables.service firewalld.service Conflicts=ip6tables.service firewalld.service

1
Shorewall6/shorewall6.service
View File

@ -6,6 +6,7 @@
[Unit] [Unit]
Description=Shorewall IPv6 firewall Description=Shorewall IPv6 firewall
After=network-online.target After=network-online.target
Wants=network-online.target
Conflicts=ip6tables.service firewalld.service Conflicts=ip6tables.service firewalld.service
[Service] [Service]

1
Shorewall6/shorewall6.service.214
View File

@ -5,6 +5,7 @@
# #
[Unit] [Unit]
Description=Shorewall IPv6 firewall Description=Shorewall IPv6 firewall
Wants=network-online.target
After=network-online.target After=network-online.target
Conflicts=ip6tables.service firewalld.service Conflicts=ip6tables.service firewalld.service