mirror of
https://gitlab.com/shorewall/code.git
synced 2024-11-29 11:04:03 +01:00
Merge branch 'master' of ssh://git.code.sf.net/p/shorewall/code
This commit is contained in:
commit
4495ed687b
@ -198,7 +198,7 @@ if [ -z "$BUILD" ]; then
|
|||||||
eval $(cat /etc/os-release | grep ^ID)
|
eval $(cat /etc/os-release | grep ^ID)
|
||||||
|
|
||||||
case $ID in
|
case $ID in
|
||||||
fedora|rhel)
|
fedora|rhel|centos|foobar)
|
||||||
BUILD=redhat
|
BUILD=redhat
|
||||||
;;
|
;;
|
||||||
debian)
|
debian)
|
||||||
|
@ -191,7 +191,7 @@ if [ -z "$BUILD" ]; then
|
|||||||
eval $(cat /etc/os-release | grep ^ID=)
|
eval $(cat /etc/os-release | grep ^ID=)
|
||||||
|
|
||||||
case $ID in
|
case $ID in
|
||||||
fedora|rhel)
|
fedora|rhel|centos|foobar)
|
||||||
BUILD=redhat
|
BUILD=redhat
|
||||||
;;
|
;;
|
||||||
debian|ubuntu)
|
debian|ubuntu)
|
||||||
|
@ -1,12 +1,12 @@
|
|||||||
#
|
#
|
||||||
# The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.4
|
# The Shoreline Firewall (Shorewall) Packet Filtering Firewall
|
||||||
#
|
#
|
||||||
# Copyright 2011 Jonathan Underwood (jonathan.underwood@gmail.com)
|
# Copyright 2011 Jonathan Underwood <jonathan.underwood@gmail.com>
|
||||||
#
|
#
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Shorewall IPv4 firewall
|
Description=Shorewall IPv4 firewall (bootup security)
|
||||||
After=syslog.target
|
|
||||||
Before=network.target
|
Before=network.target
|
||||||
|
Conflicts=firewalld.service
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=oneshot
|
Type=oneshot
|
||||||
@ -17,4 +17,4 @@ ExecStart=/sbin/shorewall-init $OPTIONS start
|
|||||||
ExecStop=/sbin/shorewall-init $OPTIONS stop
|
ExecStop=/sbin/shorewall-init $OPTIONS stop
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=basic.target
|
||||||
|
@ -206,7 +206,7 @@ if [ -z "$BUILD" ]; then
|
|||||||
eval $(cat /etc/os-release | grep ^ID)
|
eval $(cat /etc/os-release | grep ^ID)
|
||||||
|
|
||||||
case $ID in
|
case $ID in
|
||||||
fedora|rhel)
|
fedora|rhel|centos|foobar)
|
||||||
BUILD=redhat
|
BUILD=redhat
|
||||||
;;
|
;;
|
||||||
debian)
|
debian)
|
||||||
|
@ -1,12 +1,12 @@
|
|||||||
#
|
#
|
||||||
# The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.4
|
# The Shoreline Firewall (Shorewall) Packet Filtering Firewall
|
||||||
#
|
#
|
||||||
# Copyright 2011 Jonathan Underwood (jonathan.underwood@gmail.com)
|
# Copyright 2011 Jonathan Underwood <jonathan.underwood@gmail.com>
|
||||||
#
|
#
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Shorewall IPv4 firewall (lite)
|
Description=Shorewall IPv4 firewall (lite)
|
||||||
After=syslog.target
|
|
||||||
After=network.target
|
After=network.target
|
||||||
|
Conflicts=iptables.service firewalld.service
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=oneshot
|
Type=oneshot
|
||||||
@ -17,4 +17,4 @@ ExecStart=/sbin/shorewall-lite $OPTIONS start
|
|||||||
ExecStop=/sbin/shorewall-lite $OPTIONS stop
|
ExecStop=/sbin/shorewall-lite $OPTIONS stop
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=basic.target
|
||||||
|
@ -216,7 +216,7 @@ if [ -z "$BUILD" ]; then
|
|||||||
eval $(cat /etc/os-release | grep ^ID)
|
eval $(cat /etc/os-release | grep ^ID)
|
||||||
|
|
||||||
case $ID in
|
case $ID in
|
||||||
fedora|rhel)
|
fedora|rhel|centos|foobar)
|
||||||
BUILD=redhat
|
BUILD=redhat
|
||||||
;;
|
;;
|
||||||
debian)
|
debian)
|
||||||
|
@ -1,12 +1,12 @@
|
|||||||
#
|
#
|
||||||
# The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.4
|
# The Shoreline Firewall (Shorewall) Packet Filtering Firewall
|
||||||
#
|
#
|
||||||
# Copyright 2011 Jonathan Underwood (jonathan.underwood@gmail.com)
|
# Copyright 2011 Jonathan Underwood <jonathan.underwood@gmail.com>
|
||||||
#
|
#
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Shorewall IPv4 firewall
|
Description=Shorewall IPv4 firewall
|
||||||
After=syslog.target
|
|
||||||
After=network.target
|
After=network.target
|
||||||
|
Conflicts=iptables.service firewalld.service
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=oneshot
|
Type=oneshot
|
||||||
@ -17,4 +17,4 @@ ExecStart=/sbin/shorewall $OPTIONS start
|
|||||||
ExecStop=/sbin/shorewall $OPTIONS stop
|
ExecStop=/sbin/shorewall $OPTIONS stop
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=basic.target
|
||||||
|
@ -1,12 +1,12 @@
|
|||||||
#
|
#
|
||||||
# The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.4
|
# The Shoreline Firewall (Shorewall) Packet Filtering Firewall
|
||||||
#
|
#
|
||||||
# Copyright 2011 Jonathan Underwood (jonathan.underwood@gmail.com)
|
# Copyright 2011 Jonathan Underwood <jonathan.underwood@gmail.com>
|
||||||
#
|
#
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Shorewall IPv6 firewall (lite)
|
Description=Shorewall IPv6 firewall (lite)
|
||||||
After=syslog.target
|
|
||||||
After=network.target
|
After=network.target
|
||||||
|
Conflicts=ip6tables.service firewalld.service
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=oneshot
|
Type=oneshot
|
||||||
@ -17,4 +17,4 @@ ExecStart=/sbin/shorewall6-lite $OPTIONS start
|
|||||||
ExecStop=/sbin/shorewall6-lite $OPTIONS stop
|
ExecStop=/sbin/shorewall6-lite $OPTIONS stop
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=basic.target
|
||||||
|
@ -1,12 +1,12 @@
|
|||||||
#
|
#
|
||||||
# The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.4
|
# The Shoreline Firewall (Shorewall) Packet Filtering Firewall
|
||||||
#
|
#
|
||||||
# Copyright 2011 Jonathan Underwood (jonathan.underwood@gmail.com)
|
# Copyright 2011 Jonathan Underwood <jonathan.underwood@gmail.com>
|
||||||
#
|
#
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Shorewall IPv6 firewall
|
Description=Shorewall IPv6 firewall
|
||||||
After=syslog.target
|
|
||||||
After=network.target
|
After=network.target
|
||||||
|
Conflicts=ip6tables.service firewalld.service
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=oneshot
|
Type=oneshot
|
||||||
@ -17,4 +17,4 @@ ExecStart=/sbin/shorewall6 $OPTIONS start
|
|||||||
ExecStop=/sbin/shorewall6 $OPTIONS stop
|
ExecStop=/sbin/shorewall6 $OPTIONS stop
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=basic.target
|
||||||
|
Loading…
Reference in New Issue
Block a user