From d4b081de37e13d411abf27a24da1bfbc05b284d6 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 25 Oct 2019 16:32:04 +0200
Subject: [SSPS] Get rid of systemd checks and specialcasing

---
 satellit_installer/includes/00-variables.inc     |  3 ---
 satellit_installer/includes/60-setup_logging.inc | 20 ++++----------------
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/satellit_installer/includes/00-variables.inc b/satellit_installer/includes/00-variables.inc
index fa3813b..2042aa7 100644
--- a/satellit_installer/includes/00-variables.inc
+++ b/satellit_installer/includes/00-variables.inc
@@ -9,9 +9,6 @@
 export DEBIAN_FRONTEND="noninteractive"			# Part of keeping apt quiet
 export LANG="en_US.UTF-8"
 
-# Preparation for systemd-based OS:
-[ $(ps -p 1 -o comm=) = systemd ] && export SYSTEMD=true	# eg. Debian 8
-
 ### Needed Packages:
 # Set list of needed packages (scripting needs) - remember, Debian-specific so far.
 PACKAGELIST_SCRIPT="cracklib-runtime wget"
diff --git a/satellit_installer/includes/60-setup_logging.inc b/satellit_installer/includes/60-setup_logging.inc
index 4b98a09..746dd14 100644
--- a/satellit_installer/includes/60-setup_logging.inc
+++ b/satellit_installer/includes/60-setup_logging.inc
@@ -1,18 +1,6 @@
 setup_logging() {
-	echo -n "# Setting up logging for dmsd, and taskmanager (to /var/log/xxxx)... "
-	cp "$BASEDIR/static_files/logging"/80-dmsd.conf \
-	   "$BASEDIR/static_files/logging"/90-taskmanager.conf /etc/rsyslog.d/
-	cp "$BASEDIR/static_files/logging"/satellite-logrotate /etc/logrotate.d/
-	echo "ok."
-
-	echo -n "# Restarting rsyslogd... "
-	[ "$SYSTEMD" ] && systemctl restart rsyslog >/dev/null || /etc/init.d/rsyslog restart >/dev/null
-	ERR=$?
-	if [ "$ERR" -ne 0 ]; then
-		echo
-		echo "# Could not restart rsyslog correctly - error number $ERR!"
-		# Fehlerbehandlung?
-	else
-		echo "ok."
-	fi
+	echo "# Setting up rsyslog logging for dmsd, and taskmanager (to /var/log/xxxx)... "
+	cp "$BASEDIR/static_files/logging/80-dmsd.conf" \
+	   "$BASEDIR/static_files/logging/90-taskmanager.conf" /etc/rsyslog.d/ || perror "Could not add rsyslog rules"
+	cp "$BASEDIR/static_files/logging/satellite-logrotate" /etc/logrotate.d/ || perror "Could not add logrotate rules"
 }
-- 
cgit v1.2.3-55-g7522