holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Merge branch 'master' of ssh://git.code.sf.net/p/shorewall/code into 5.0.0

Browse Source 
Conflicts:
	Shorewall-core/shorewallrc.debian.systemd
	Shorewall-init/shorewall-init.service.debian

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2015-08-10 17:49:00 -07:00
commit 56aa95ea4f
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Shorewall-init/shorewall-init.service.214.debian Normal file
View File

@ -0,0 +1,18 @@
#
# The Shoreline Firewall (Shorewall) Packet Filtering Firewall
#
# Copyright 2011 Jonathan Underwood <jonathan.underwood@gmail.com>
#
[Unit]
Description=Shorewall firewall (bootup security)
Before=network-pre.target
Wants=network-pre.target
Conflicts=iptables.service firewalld.service
[Service]
Type=oneshot
RemainAfterExit=yes
EnvironmentFile=-/etc/default/shorewall-init
StandardOutput=syslog
ExecStart=/sbin/shorewall-init start
ExecStop=/sbin/shorewall-init stop

5
Shorewall-init/shorewall-init.service.debian
View File

@ -5,9 +5,8 @@
# #
[Unit] [Unit]
Description=Shorewall firewall (bootup security) Description=Shorewall firewall (bootup security)
Before=network-pre.target Before=network.target
Wants=network-pre.target Conflicts=iptables.service ip6tables.service firewalld.service
Conflicts=iptables.service firewalld.service
[Service] [Service]
Type=oneshot Type=oneshot