From 4398d1afff6cd223e6ae9643de1a9dbca03e3aae Mon Sep 17 00:00:00 2001 From: Darren 'Tadgy' Austin Date: Wed, 24 Aug 2022 00:45:13 +0100 Subject: [PATCH] Remove old start cruft. --- rc.d/rc.local | 28 ++-------------------------- rc.d/rc.local_shutdown | 6 ++++-- 2 files changed, 6 insertions(+), 28 deletions(-) diff --git a/rc.d/rc.local b/rc.d/rc.local index 288759c..56c8dbb 100755 --- a/rc.d/rc.local +++ b/rc.d/rc.local @@ -1,5 +1,4 @@ #!/bin/bash -# /etc/rc.d/rc.local - Local system startup script. # Copyright (c) 2005-2022: # Darren 'Tadgy' Austin # Licensed under the terms of the GNU General Public License version 3. @@ -31,34 +30,11 @@ # Start Exim. [[ -x /etc/rc.d/rc.exim ]] && /etc/rc.d/rc.exim start -# FIXME: Move the lumberjack starts into the rc.ds? # Start proftpd. -[[ -x /etc/rc.d/rc.proftpd ]] && { - [[ -x /opt/bin/lumberjack ]] && { - if [[ -x /usr/bin/daemon ]]; then - /usr/bin/daemon -N -n lumberjack-ftpd -r -a 60 -A 5 -L 300 -o daemon.debug -- /opt/bin/lumberjack -u logger -z -r -i /run/slackware.uk-ftpd.log \ - -o logger:ftp -mp 006 -l logs/ftpd-transfers.log /data/sites/slackware.uk logs/%Y/%m/ftpd-transfers.log - else - /opt/bin/lumberjack -u logger -z -r -i /run/slackware.uk-ftpd.log -o logger:ftp -mp 006 -l logs/ftpd-transfers.log /data/sites/slackware.uk \ - logs/%Y/%m/ftpd-transfers.log & - fi - } - /etc/rc.d/rc.proftpd start -} +[[ -x /etc/rc.d/rc.proftpd ]] && /etc/rc.d/rc.proftpd start # Start the rsync daemon. -[[ -x /etc/rc.d/rc.rsyncd ]] && { - [[ -x /opt/bin/lumberjack ]] && { - if [[ -x /usr/bin/daemon ]]; then - /usr/bin/daemon -N -n lumberjack-rsyncd -r -a 60 -A 5 -L 300 -o daemon.debug -- /opt/bin/lumberjack -u logger -z -r -i /run/rsyncd.log \ - -o logger:mirror -mp 006 -l logs/rsyncd-transfers.log /data/sites/slackware.uk logs/%Y/%m/rsyncd-transfers.log - else - /opt/bin/lumberjack -u logger -z -r -i /run/rsyncd.log -o logger:mirror -mp 006 -l logs/rsyncd-transfers.log /data/sites/slackware.uk \ - logs/%Y/%m/rsyncd-transfers.log & - fi - } - /etc/rc.d/rc.rsyncd start -} +[[ -x /etc/rc.d/rc.rsyncd ]] && /etc/rc.d/rc.rsyncd start # Start the bandwidth bar generator. [ -x /etc/rc.d/rc.bwbar ] && /etc/rc.d/rc.bwbar start diff --git a/rc.d/rc.local_shutdown b/rc.d/rc.local_shutdown index 309b61a..87c8a09 100755 --- a/rc.d/rc.local_shutdown +++ b/rc.d/rc.local_shutdown @@ -1,6 +1,8 @@ #!/bin/bash -# /etc/rc.d/rc.local_shutdown - Local system shutdown script. -# This script will be run when the system is shutdown or rebooted. +# Version: 0.2.0 +# Copyright (c) 2022: +# Darren 'Tadgy' Austin +# Licensed under the terms of the GNU General Public License version 3. # Notify that the server is shutting down. CONFIG_FILE="server" /opt/bin/pushover -T "${HOSTNAME%%.*}" -p 1 -m "Shutting down."