From cecc81ce82a4357256271cdd0f7587803edc1b29 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sun, 26 Jul 2015 10:58:03 -0700 Subject: [PATCH] Update .service files - make the .214 versions the default and remove the ones name *.214 - Add 'ExecReload' to all but Shorewall-init - Create Debian-specific versions with /etc/default rather than /etc/sysconfig --- Shorewall-core/shorewallrc.debian | 4 ++-- Shorewall-init/shorewall-init.service | 5 +++-- ...rewall-init.service.214 => shorewall-init.service.debian} | 2 +- Shorewall-lite/shorewall-lite.service | 1 + ...rewall-lite.service.214 => shorewall-lite.service.debian} | 3 ++- Shorewall/configfiles/shorewall.conf | 2 +- Shorewall/shorewall.service | 1 + .../{shorewall.service.214 => shorewall.service.debian} | 3 ++- Shorewall6-lite/shorewall6-lite.service | 3 ++- ...wall6-lite.service.214 => shorewall6-lite.service.debian} | 3 ++- Shorewall6/configfiles/shorewall6.conf | 2 +- Shorewall6/shorewall6.service | 1 + .../{shorewall6.service.214 => shorewall6.service.debian} | 3 ++- 13 files changed, 21 insertions(+), 12 deletions(-) rename Shorewall-init/{shorewall-init.service.214 => shorewall-init.service.debian} (90%) rename Shorewall-lite/{shorewall-lite.service.214 => shorewall-lite.service.debian} (82%) rename Shorewall/{shorewall.service.214 => shorewall.service.debian} (83%) rename Shorewall6-lite/{shorewall6-lite.service.214 => shorewall6-lite.service.debian} (83%) rename Shorewall6/{shorewall6.service.214 => shorewall6.service.debian} (82%) diff --git a/Shorewall-core/shorewallrc.debian b/Shorewall-core/shorewallrc.debian index 209096891..9b00bd42c 100644 --- a/Shorewall-core/shorewallrc.debian +++ b/Shorewall-core/shorewallrc.debian @@ -15,9 +15,9 @@ INITFILE=$PRODUCT #Name of the product's installed SysV in INITSOURCE=init.debian.sh #Name of the distributed file to be installed as the SysV init script ANNOTATED= #If non-zero, annotated configuration files are installed SYSCONFFILE=default.debian #Name of the distributed file to be installed in $SYSCONFDIR -SERVICEFILE= #Name of the file to install in $SYSTEMD. Default is $PRODUCT.service +SERVICEFILE=$PRODUCT.service.debian #Name of the file to install in $SYSTEMD. Default is $PRODUCT.service SYSCONFDIR=/etc/default #Directory where SysV init parameter files are installed -SERVICEDIR= #Directory where .service files are installed (systems running systemd only) +SERVICEDIR=/etc/systemd/system #Directory where .service files are installed (systems running systemd only) SPARSE=Yes #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR VARLIB=/var/lib #Directory where product variable data is stored. VARDIR=${VARLIB}/$PRODUCT #Directory where product variable data is stored. diff --git a/Shorewall-init/shorewall-init.service b/Shorewall-init/shorewall-init.service index 6842aa531..5c86e99e9 100644 --- a/Shorewall-init/shorewall-init.service +++ b/Shorewall-init/shorewall-init.service @@ -5,8 +5,9 @@ # [Unit] Description=Shorewall firewall (bootup security) -Before=network.target -Conflicts=iptables.service ip6tables.service firewalld.service +Before=network-pre.target +Wants=network-pre.target +Conflicts=iptables.service firewalld.service [Service] Type=oneshot diff --git a/Shorewall-init/shorewall-init.service.214 b/Shorewall-init/shorewall-init.service.debian similarity index 90% rename from Shorewall-init/shorewall-init.service.214 rename to Shorewall-init/shorewall-init.service.debian index 5c86e99e9..e250668b1 100644 --- a/Shorewall-init/shorewall-init.service.214 +++ b/Shorewall-init/shorewall-init.service.debian @@ -12,7 +12,7 @@ Conflicts=iptables.service firewalld.service [Service] Type=oneshot RemainAfterExit=yes -EnvironmentFile=-/etc/sysconfig/shorewall-init +EnvironmentFile=-/etc/default/shorewall-init StandardOutput=syslog ExecStart=/sbin/shorewall-init start ExecStop=/sbin/shorewall-init stop diff --git a/Shorewall-lite/shorewall-lite.service b/Shorewall-lite/shorewall-lite.service index 64b7133c7..916733e01 100644 --- a/Shorewall-lite/shorewall-lite.service +++ b/Shorewall-lite/shorewall-lite.service @@ -16,6 +16,7 @@ EnvironmentFile=-/etc/sysconfig/shorewall-lite StandardOutput=syslog ExecStart=/sbin/shorewall-lite $OPTIONS start $STARTOPTIONS ExecStop=/sbin/shorewall-lite $OPTIONS stop +ExecReload=/sbin/shorewall-lite $OPTIONS reload $RELOADOPTIONS [Install] WantedBy=basic.target diff --git a/Shorewall-lite/shorewall-lite.service.214 b/Shorewall-lite/shorewall-lite.service.debian similarity index 82% rename from Shorewall-lite/shorewall-lite.service.214 rename to Shorewall-lite/shorewall-lite.service.debian index 64b7133c7..75bc522f5 100644 --- a/Shorewall-lite/shorewall-lite.service.214 +++ b/Shorewall-lite/shorewall-lite.service.debian @@ -12,10 +12,11 @@ Conflicts=iptables.service firewalld.service [Service] Type=oneshot RemainAfterExit=yes -EnvironmentFile=-/etc/sysconfig/shorewall-lite +EnvironmentFile=-/etc/default/shorewall-lite StandardOutput=syslog ExecStart=/sbin/shorewall-lite $OPTIONS start $STARTOPTIONS ExecStop=/sbin/shorewall-lite $OPTIONS stop +ExecReload=/sbin/shorewall-lite $OPTIONS reload $RELOADOPTIONS [Install] WantedBy=basic.target diff --git a/Shorewall/configfiles/shorewall.conf b/Shorewall/configfiles/shorewall.conf index b480dbd41..6ec20ce95 100644 --- a/Shorewall/configfiles/shorewall.conf +++ b/Shorewall/configfiles/shorewall.conf @@ -234,7 +234,7 @@ USE_RT_NAMES=No WARNOLDCAPVERSION=Yes -WORKAROUNDS=Yes +WORKAROUNDS=No ZONE2ZONE=- diff --git a/Shorewall/shorewall.service b/Shorewall/shorewall.service index db1bb9483..80f6e51eb 100644 --- a/Shorewall/shorewall.service +++ b/Shorewall/shorewall.service @@ -16,6 +16,7 @@ EnvironmentFile=-/etc/sysconfig/shorewall StandardOutput=syslog ExecStart=/sbin/shorewall $OPTIONS start $STARTOPTIONS ExecStop=/sbin/shorewall $OPTIONS stop +ExecReload=/sbin/shorewall $OPTIONS reload $RELOADOPTIONS [Install] WantedBy=basic.target diff --git a/Shorewall/shorewall.service.214 b/Shorewall/shorewall.service.debian similarity index 83% rename from Shorewall/shorewall.service.214 rename to Shorewall/shorewall.service.debian index db1bb9483..7aee4daf3 100644 --- a/Shorewall/shorewall.service.214 +++ b/Shorewall/shorewall.service.debian @@ -12,10 +12,11 @@ Conflicts=iptables.service firewalld.service [Service] Type=oneshot RemainAfterExit=yes -EnvironmentFile=-/etc/sysconfig/shorewall +EnvironmentFile=-/etc/default/shorewall StandardOutput=syslog ExecStart=/sbin/shorewall $OPTIONS start $STARTOPTIONS ExecStop=/sbin/shorewall $OPTIONS stop +ExecReload=/sbin/shorewall $OPTIONS reload $RELOADOPTIONS [Install] WantedBy=basic.target diff --git a/Shorewall6-lite/shorewall6-lite.service b/Shorewall6-lite/shorewall6-lite.service index 151bb2d5c..f44d99bbb 100644 --- a/Shorewall6-lite/shorewall6-lite.service +++ b/Shorewall6-lite/shorewall6-lite.service @@ -14,8 +14,9 @@ Type=oneshot RemainAfterExit=yes EnvironmentFile=-/etc/sysconfig/shorewall6-lite StandardOutput=syslog -ExecStart=/sbin/shorewall6-lite $OPTIONS start $STARTOPTIONS +ExecStart=/sbin/shorewall6-lite $OPTIONS start ExecStop=/sbin/shorewall6-lite $OPTIONS stop +ExecReload=/sbin/shorewall6-lite $OPTIONS reload [Install] WantedBy=basic.target diff --git a/Shorewall6-lite/shorewall6-lite.service.214 b/Shorewall6-lite/shorewall6-lite.service.debian similarity index 83% rename from Shorewall6-lite/shorewall6-lite.service.214 rename to Shorewall6-lite/shorewall6-lite.service.debian index 71fe51531..f91346333 100644 --- a/Shorewall6-lite/shorewall6-lite.service.214 +++ b/Shorewall6-lite/shorewall6-lite.service.debian @@ -12,10 +12,11 @@ Conflicts=ip6tables.service firewalld.service [Service] Type=oneshot RemainAfterExit=yes -EnvironmentFile=-/etc/sysconfig/shorewall6-lite +EnvironmentFile=-/etc/default/shorewall6-lite StandardOutput=syslog ExecStart=/sbin/shorewall6-lite $OPTIONS start ExecStop=/sbin/shorewall6-lite $OPTIONS stop +ExecReload=/sbin/shorewall6-lite $OPTIONS reload [Install] WantedBy=basic.target diff --git a/Shorewall6/configfiles/shorewall6.conf b/Shorewall6/configfiles/shorewall6.conf index c4ae24099..38860f6b0 100644 --- a/Shorewall6/configfiles/shorewall6.conf +++ b/Shorewall6/configfiles/shorewall6.conf @@ -209,7 +209,7 @@ USE_RT_NAMES=No WARNOLDCAPVERSION=Yes -WORKAROUNDS=Yes +WORKAROUNDS=No ZONE2ZONE=- diff --git a/Shorewall6/shorewall6.service b/Shorewall6/shorewall6.service index 70aa0e430..6c8d5d664 100644 --- a/Shorewall6/shorewall6.service +++ b/Shorewall6/shorewall6.service @@ -16,6 +16,7 @@ EnvironmentFile=-/etc/sysconfig/shorewall6 StandardOutput=syslog ExecStart=/sbin/shorewall6 $OPTIONS start $STARTOPTIONS ExecStop=/sbin/shorewall6 $OPTIONS stop +ExecReload=/sbin/shorewall6 $OPTIONS reload $RELOADOPTIONS [Install] WantedBy=basic.target diff --git a/Shorewall6/shorewall6.service.214 b/Shorewall6/shorewall6.service.debian similarity index 82% rename from Shorewall6/shorewall6.service.214 rename to Shorewall6/shorewall6.service.debian index 70aa0e430..cf724d3ed 100644 --- a/Shorewall6/shorewall6.service.214 +++ b/Shorewall6/shorewall6.service.debian @@ -12,10 +12,11 @@ Conflicts=ip6tables.service firewalld.service [Service] Type=oneshot RemainAfterExit=yes -EnvironmentFile=-/etc/sysconfig/shorewall6 +EnvironmentFile=-/etc/default/shorewall6 StandardOutput=syslog ExecStart=/sbin/shorewall6 $OPTIONS start $STARTOPTIONS ExecStop=/sbin/shorewall6 $OPTIONS stop +ExecReload=/sbin/shorewall6 $OPTIONS reload $RELOADOPTIONS [Install] WantedBy=basic.target