From a03f00bf0f326aefb86973d15f3484183fd6fa8b Mon Sep 17 00:00:00 2001 From: Tuomo Soini Date: Tue, 23 Sep 2014 16:43:08 +0300 Subject: [PATCH] systemd services: multi-user is not same as old runlevel 3 so use basic add conflicts to obviously conflicting services remove old version number from init files remove legacy syslog.target which is not needed on modern systems fix formatting of email address onold Copyright text Signed-off-by: Tuomo Soini --- Shorewall-init/shorewall-init.service | 10 +++++----- Shorewall-lite/shorewall-lite.service | 8 ++++---- Shorewall/shorewall.service | 8 ++++---- Shorewall6-lite/shorewall6-lite.service | 8 ++++---- Shorewall6/shorewall6.service | 8 ++++---- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Shorewall-init/shorewall-init.service b/Shorewall-init/shorewall-init.service index 3ac5c19b1..5a7f19b0d 100644 --- a/Shorewall-init/shorewall-init.service +++ b/Shorewall-init/shorewall-init.service @@ -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 # [Unit] -Description=Shorewall IPv4 firewall -After=syslog.target +Description=Shorewall IPv4 firewall (bootup security) Before=network.target +Conflicts=firewalld.service [Service] Type=oneshot @@ -17,4 +17,4 @@ ExecStart=/sbin/shorewall-init $OPTIONS start ExecStop=/sbin/shorewall-init $OPTIONS stop [Install] -WantedBy=multi-user.target +WantedBy=basic.target diff --git a/Shorewall-lite/shorewall-lite.service b/Shorewall-lite/shorewall-lite.service index 7d9873b52..9073b05bc 100644 --- a/Shorewall-lite/shorewall-lite.service +++ b/Shorewall-lite/shorewall-lite.service @@ -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 # [Unit] Description=Shorewall IPv4 firewall (lite) -After=syslog.target After=network.target +Conflicts=iptables.service firewalld.service [Service] Type=oneshot @@ -17,4 +17,4 @@ ExecStart=/sbin/shorewall-lite $OPTIONS start ExecStop=/sbin/shorewall-lite $OPTIONS stop [Install] -WantedBy=multi-user.target +WantedBy=basic.target diff --git a/Shorewall/shorewall.service b/Shorewall/shorewall.service index e8e91bc61..679eff3d8 100644 --- a/Shorewall/shorewall.service +++ b/Shorewall/shorewall.service @@ -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 # [Unit] Description=Shorewall IPv4 firewall -After=syslog.target After=network.target +Conflicts=iptables.service firewalld.service [Service] Type=oneshot @@ -17,4 +17,4 @@ ExecStart=/sbin/shorewall $OPTIONS start ExecStop=/sbin/shorewall $OPTIONS stop [Install] -WantedBy=multi-user.target +WantedBy=basic.target diff --git a/Shorewall6-lite/shorewall6-lite.service b/Shorewall6-lite/shorewall6-lite.service index a1d03860e..9a19257d0 100644 --- a/Shorewall6-lite/shorewall6-lite.service +++ b/Shorewall6-lite/shorewall6-lite.service @@ -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 # [Unit] Description=Shorewall IPv6 firewall (lite) -After=syslog.target After=network.target +Conflicts=ip6tables.service firewalld.service [Service] Type=oneshot @@ -17,4 +17,4 @@ ExecStart=/sbin/shorewall6-lite $OPTIONS start ExecStop=/sbin/shorewall6-lite $OPTIONS stop [Install] -WantedBy=multi-user.target +WantedBy=basic.target diff --git a/Shorewall6/shorewall6.service b/Shorewall6/shorewall6.service index 97f984bc8..6e35ea0b6 100644 --- a/Shorewall6/shorewall6.service +++ b/Shorewall6/shorewall6.service @@ -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 # [Unit] Description=Shorewall IPv6 firewall -After=syslog.target After=network.target +Conflicts=ip6tables.service firewalld.service [Service] Type=oneshot @@ -17,4 +17,4 @@ ExecStart=/sbin/shorewall6 $OPTIONS start ExecStop=/sbin/shorewall6 $OPTIONS stop [Install] -WantedBy=multi-user.target +WantedBy=basic.target