From: Frank Brehm <frank@brehm-online.com>
Date: Wed, 28 Jun 2017 22:37:50 +0000 (+0200)
Subject: committing changes in /etc after emerge run
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=118eebbfa0c62f1276c9bef409719e358b3ee59a;p=config%2Fbruni%2Fetc.git

committing changes in /etc after emerge run

Package changes:
---

diff --git a/systemd/system/iptables-save.service b/systemd/system/iptables-save.service
deleted file mode 100644
index 02588fa6..00000000
--- a/systemd/system/iptables-save.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Save iptables firewall
-DefaultDependencies=no
-After=iptables.service
-# fail immediately if iptables.service has not been started
-Requisite=iptables.service
-Before=shutdown.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=no
-ExecStart=/usr/local/lib/iptables-helper save
-
-[Install]
-WantedBy=shutdown.target
diff --git a/systemd/system/iptables-save.service.d b/systemd/system/iptables-save.service.d
deleted file mode 120000
index 6eb14290..00000000
--- a/systemd/system/iptables-save.service.d
+++ /dev/null
@@ -1 +0,0 @@
-/etc/systemd/system/iptables.service.d
\ No newline at end of file
diff --git a/systemd/system/iptables.service b/systemd/system/iptables.service
deleted file mode 100644
index 46f04a4b..00000000
--- a/systemd/system/iptables.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=iptables firewall
-DefaultDependencies=false
-After=local-fs.target
-Before=basic.target
-# Note: shutdown is handled by iptables-save (if enabled)
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/local/lib/iptables-helper start
-ExecReload=/usr/local/lib/iptables-helper reload
-ExecStop=/usr/local/lib/iptables-helper stop
-# Note: ExecRestart hasn't been implemented by systemd (yet)
-
-[Install]
-WantedBy=sysinit.target multi-user.target
-Also=iptables-save.service
diff --git a/systemd/system/iptables.service.d/10iptables.conf b/systemd/system/iptables.service.d/10iptables.conf
deleted file mode 100644
index 1133bdf2..00000000
--- a/systemd/system/iptables.service.d/10iptables.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-[Service]
-
-# Files from which to initialize the ip*tables rules.
-# Personally, I like to keep all rules in one directory
-#Environment="IPTABLES_INIT=/var/lib/iptables/init-IPv4.rules"
-#Environment="IP6TABLES_INIT=/var/lib/iptables/init-IPv6.rules"
-# But these are the OpenRC defaults:
-Environment="IPTABLES_INIT=/var/lib/iptables/rules-save"
-Environment="IP6TABLES_INIT=/var/lib/ip6tables/rules-save"
-
-# At system shutdown (or systemctl start iptables-save), current rules are
-# saved to the above files per default.
-# This "Save as" functionality is very usefull for development or hardened
-# production servers; it allows to inspect the saved rules before applying
-# them for the next start/reload.
-# If you prefer never to save the rules at all, simply specify /dev/null here.
-#Environment="IPTABLES_SAVE_AS=/var/lib/iptables/inspect-IPv4.rules"
-#Environment="IP6TABLES_SAVE_AS=/var/lib/iptables/inspect-IPv6.rules"
-
-# Save & restore the counters [yes|no]?
-Environment="COUNTERS=yes"