From c447ddd03e93f8724ed51c6d5b7f02d4ff81c916 Mon Sep 17 00:00:00 2001 From: Tuomo Soini Date: Tue, 5 Jan 2016 12:01:21 +0200 Subject: [PATCH 1/3] systemd service: rename pre214 systemd versions to pre214 and remove separeate 214 variants --- Shorewall-init/shorewall-init.service | 3 ++- Shorewall-init/shorewall-init.service.214 | 20 ----------------- .../shorewall-init.service.214.debian | 21 ------------------ Shorewall-init/shorewall-init.service.debian | 3 ++- Shorewall-lite/shorewall-lite.service.214 | 21 ------------------ Shorewall/shorewall.service.214 | 22 ------------------- Shorewall6-lite/shorewall6-lite.service.214 | 21 ------------------ Shorewall6/shorewall6.service.214 | 22 ------------------- 8 files changed, 4 insertions(+), 129 deletions(-) delete mode 100644 Shorewall-init/shorewall-init.service.214 delete mode 100644 Shorewall-init/shorewall-init.service.214.debian delete mode 100644 Shorewall-lite/shorewall-lite.service.214 delete mode 100644 Shorewall/shorewall.service.214 delete mode 100644 Shorewall6-lite/shorewall6-lite.service.214 delete mode 100644 Shorewall6/shorewall6.service.214 diff --git a/Shorewall-init/shorewall-init.service b/Shorewall-init/shorewall-init.service index d64562763..01cf13f93 100644 --- a/Shorewall-init/shorewall-init.service +++ b/Shorewall-init/shorewall-init.service @@ -5,7 +5,8 @@ # [Unit] Description=Shorewall firewall (bootup security) -Before=network.target +Before=network-pre.target +Wants=network-pre.target [Service] Type=oneshot diff --git a/Shorewall-init/shorewall-init.service.214 b/Shorewall-init/shorewall-init.service.214 deleted file mode 100644 index 01cf13f93..000000000 --- a/Shorewall-init/shorewall-init.service.214 +++ /dev/null @@ -1,20 +0,0 @@ -# -# The Shoreline Firewall (Shorewall) Packet Filtering Firewall -# -# Copyright 2011 Jonathan Underwood -# -[Unit] -Description=Shorewall firewall (bootup security) -Before=network-pre.target -Wants=network-pre.target - -[Service] -Type=oneshot -RemainAfterExit=yes -EnvironmentFile=-/etc/sysconfig/shorewall-init -StandardOutput=syslog -ExecStart=/sbin/shorewall-init start -ExecStop=/sbin/shorewall-init stop - -[Install] -WantedBy=basic.target diff --git a/Shorewall-init/shorewall-init.service.214.debian b/Shorewall-init/shorewall-init.service.214.debian deleted file mode 100644 index 6e42b3cca..000000000 --- a/Shorewall-init/shorewall-init.service.214.debian +++ /dev/null @@ -1,21 +0,0 @@ -# -# The Shoreline Firewall (Shorewall) Packet Filtering Firewall -# -# Copyright 2011 Jonathan Underwood -# Copyright 2015 Tom Eastep -# -[Unit] -Description=Shorewall firewall (bootup security) -Before=network-pre.target -Wants=network-pre.target - -[Service] -Type=oneshot -RemainAfterExit=yes -EnvironmentFile=-/etc/default/shorewall-init -StandardOutput=syslog -ExecStart=/sbin/shorewall-init start -ExecStop=/sbin/shorewall-init stop - -[Install] -WantedBy=basic.target diff --git a/Shorewall-init/shorewall-init.service.debian b/Shorewall-init/shorewall-init.service.debian index 303b5123b..6e42b3cca 100644 --- a/Shorewall-init/shorewall-init.service.debian +++ b/Shorewall-init/shorewall-init.service.debian @@ -6,7 +6,8 @@ # [Unit] Description=Shorewall firewall (bootup security) -Before=network.target +Before=network-pre.target +Wants=network-pre.target [Service] Type=oneshot diff --git a/Shorewall-lite/shorewall-lite.service.214 b/Shorewall-lite/shorewall-lite.service.214 deleted file mode 100644 index 64b7133c7..000000000 --- a/Shorewall-lite/shorewall-lite.service.214 +++ /dev/null @@ -1,21 +0,0 @@ -# -# The Shoreline Firewall (Shorewall) Packet Filtering Firewall -# -# Copyright 2011 Jonathan Underwood -# -[Unit] -Description=Shorewall IPv4 firewall (lite) -Wants=network-online.target -After=network-online.target -Conflicts=iptables.service firewalld.service - -[Service] -Type=oneshot -RemainAfterExit=yes -EnvironmentFile=-/etc/sysconfig/shorewall-lite -StandardOutput=syslog -ExecStart=/sbin/shorewall-lite $OPTIONS start $STARTOPTIONS -ExecStop=/sbin/shorewall-lite $OPTIONS stop - -[Install] -WantedBy=basic.target diff --git a/Shorewall/shorewall.service.214 b/Shorewall/shorewall.service.214 deleted file mode 100644 index 80f6e51eb..000000000 --- a/Shorewall/shorewall.service.214 +++ /dev/null @@ -1,22 +0,0 @@ -# -# The Shoreline Firewall (Shorewall) Packet Filtering Firewall -# -# Copyright 2011 Jonathan Underwood -# -[Unit] -Description=Shorewall IPv4 firewall -Wants=network-online.target -After=network-online.target -Conflicts=iptables.service firewalld.service - -[Service] -Type=oneshot -RemainAfterExit=yes -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/Shorewall6-lite/shorewall6-lite.service.214 b/Shorewall6-lite/shorewall6-lite.service.214 deleted file mode 100644 index 71fe51531..000000000 --- a/Shorewall6-lite/shorewall6-lite.service.214 +++ /dev/null @@ -1,21 +0,0 @@ -# -# The Shoreline Firewall (Shorewall) Packet Filtering Firewall -# -# Copyright 2011 Jonathan Underwood -# -[Unit] -Description=Shorewall IPv6 firewall (lite) -Wants=network-online.target -After=network-online.target -Conflicts=ip6tables.service firewalld.service - -[Service] -Type=oneshot -RemainAfterExit=yes -EnvironmentFile=-/etc/sysconfig/shorewall6-lite -StandardOutput=syslog -ExecStart=/sbin/shorewall6-lite $OPTIONS start -ExecStop=/sbin/shorewall6-lite $OPTIONS stop - -[Install] -WantedBy=basic.target diff --git a/Shorewall6/shorewall6.service.214 b/Shorewall6/shorewall6.service.214 deleted file mode 100644 index 6c8d5d664..000000000 --- a/Shorewall6/shorewall6.service.214 +++ /dev/null @@ -1,22 +0,0 @@ -# -# The Shoreline Firewall (Shorewall) Packet Filtering Firewall -# -# Copyright 2011 Jonathan Underwood -# -[Unit] -Description=Shorewall IPv6 firewall -Wants=network-online.target -After=network-online.target -Conflicts=ip6tables.service firewalld.service - -[Service] -Type=oneshot -RemainAfterExit=yes -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 From ff821e57c22f52460901a6293e728e86e1cbf368 Mon Sep 17 00:00:00 2001 From: Tuomo Soini Date: Tue, 5 Jan 2016 12:04:37 +0200 Subject: [PATCH 2/3] shorewall6*.service: make sure shorewall and shorewall6 won't start at same time Signed-off-by: Tuomo Soini --- Shorewall6/shorewall6.service | 2 +- Shorewall6/shorewall6.service.debian | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Shorewall6/shorewall6.service b/Shorewall6/shorewall6.service index 6c8d5d664..869bfdc80 100644 --- a/Shorewall6/shorewall6.service +++ b/Shorewall6/shorewall6.service @@ -6,7 +6,7 @@ [Unit] Description=Shorewall IPv6 firewall Wants=network-online.target -After=network-online.target +After=network-online.target shorewall.service Conflicts=ip6tables.service firewalld.service [Service] diff --git a/Shorewall6/shorewall6.service.debian b/Shorewall6/shorewall6.service.debian index ad0225d50..e74d0c339 100644 --- a/Shorewall6/shorewall6.service.debian +++ b/Shorewall6/shorewall6.service.debian @@ -7,7 +7,7 @@ [Unit] Description=Shorewall IPv6 firewall Wants=network-online.target -After=network-online.target +After=network-online.target shorewall.service Conflicts=ip6tables.service firewalld.service [Service] From da936692455d993fc39c54ee2c7b21be30bfc4d7 Mon Sep 17 00:00:00 2001 From: Tuomo Soini Date: Tue, 5 Jan 2016 20:18:25 +0200 Subject: [PATCH 3/3] Revert "shorewall6*.service: make sure shorewall and shorewall6 won't start at same time" This reverts commit ff821e57c22f52460901a6293e728e86e1cbf368. Signed-off-by: Tuomo Soini --- Shorewall6/shorewall6.service | 2 +- Shorewall6/shorewall6.service.debian | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Shorewall6/shorewall6.service b/Shorewall6/shorewall6.service index 869bfdc80..6c8d5d664 100644 --- a/Shorewall6/shorewall6.service +++ b/Shorewall6/shorewall6.service @@ -6,7 +6,7 @@ [Unit] Description=Shorewall IPv6 firewall Wants=network-online.target -After=network-online.target shorewall.service +After=network-online.target Conflicts=ip6tables.service firewalld.service [Service] diff --git a/Shorewall6/shorewall6.service.debian b/Shorewall6/shorewall6.service.debian index e74d0c339..ad0225d50 100644 --- a/Shorewall6/shorewall6.service.debian +++ b/Shorewall6/shorewall6.service.debian @@ -7,7 +7,7 @@ [Unit] Description=Shorewall IPv6 firewall Wants=network-online.target -After=network-online.target shorewall.service +After=network-online.target Conflicts=ip6tables.service firewalld.service [Service]