From 6d3e7ce6484fb5ca013c33c44769e1bf6beaa81f Mon Sep 17 00:00:00 2001 From: Valentin Lab Date: Fri, 21 May 2021 10:48:43 +0200 Subject: [PATCH] new: [host] several small adjustments Signed-off-by: Valentin Lab --- precise/host/hooks/install.d/40-btrfs.sh | 2 +- precise/host/hooks/install.d/60-docker.sh | 2 +- precise/host/hooks/install.d/61-mirror-dir.sh | 1 + precise/host/hooks/install.d/75-fail2ban.sh | 23 ++++++++++++ .../host/hooks/install.d/80-dns-waterfall.sh | 2 +- precise/host/hooks/install.d/95-checks.sh | 37 +++++++++++++++---- precise/host/hooks/install.d/96-backup-lxc.sh | 4 +- 7 files changed, 59 insertions(+), 12 deletions(-) create mode 120000 precise/host/hooks/install.d/61-mirror-dir.sh create mode 100644 precise/host/hooks/install.d/75-fail2ban.sh diff --git a/precise/host/hooks/install.d/40-btrfs.sh b/precise/host/hooks/install.d/40-btrfs.sh index 2c60782..a33e5a2 100755 --- a/precise/host/hooks/install.d/40-btrfs.sh +++ b/precise/host/hooks/install.d/40-btrfs.sh @@ -54,7 +54,7 @@ if [ "$UPDATE_BTRFS_TOOLS" ]; then zlib1g-dev python3-dev python3-setuptools libacl1-dev e2fslibs-dev \ libblkid-dev liblzo2-dev libzstd-dev /etc/resolv.conf diff --git a/precise/host/hooks/install.d/95-checks.sh b/precise/host/hooks/install.d/95-checks.sh index 4b8bd4c..9830af3 100755 --- a/precise/host/hooks/install.d/95-checks.sh +++ b/precise/host/hooks/install.d/95-checks.sh @@ -2,16 +2,39 @@ ## REQUIRES: 0k-manage mail -ln -sf /opt/apps/0k-manage/src/etc/cron.hourly/check-* /etc/cron.hourly/ - - -ln -sf /opt/apps/0k-charms/rsync-backup/resources/bin/mirror-dir-check /usr/local/sbin/ - - +[ -n "${BACKUP_SERVER}" ] || { + echo "Error: you must set \$BACKUP_SERVER prior to running this script." >&2 + exit 1 +} + +if ! [ -e "/etc/default/alerting" ]; then + if [ -z "$DEFAULT_ALERTING_EMAILS" ]; then + echo "You must define \$DEFAULT_ALERTING_EMAILS before launching this script." >&2 + exit 1 + fi + cat < /etc/default/alerting +MAIL_DESTS=( +$( +for email in $DEFAULT_ALERTING_EMAILS; do +echo " $email" +done +) +) +EOF +fi + +ln -sfv /opt/apps/0k-manage/src/etc/cron.hourly/check-* /etc/cron.hourly/ + +if ! [ -e /usr/local/sbin/mirror-dir ]; then + ln -sfv /opt/apps/0k-charms/rsync-backup/resources/bin/mirror-dir /usr/local/sbin/ +fi + +mailname=$(cat /etc/mailname) +mailname=${mailname%.localdomain} cat < /etc/cron.d/mirror-dir-check SHELL=/bin/bash PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -35 * * * * root mirror-dir-check -d "core-06.0k.io:10023" -n '12 hours' | logger -t mirror-dir-check +35 * * * * root mirror-dir check -d "$BACKUP_SERVER:10023" -n '12 hours' | logger -t mirror-dir-check EOF \ No newline at end of file diff --git a/precise/host/hooks/install.d/96-backup-lxc.sh b/precise/host/hooks/install.d/96-backup-lxc.sh index d912f68..b2dc233 100755 --- a/precise/host/hooks/install.d/96-backup-lxc.sh +++ b/precise/host/hooks/install.d/96-backup-lxc.sh @@ -6,8 +6,8 @@ ## Backup lxc ## -ln -sf /opt/apps/lxc-scripts/etc/cron.hourly/* /etc/cron.hourly/ -ln -sf /opt/apps/lxc-scripts/etc/cron.daily/* /etc/cron.daily/ +ln -sfv /opt/apps/lxc-scripts/etc/cron.hourly/* /etc/cron.hourly/ +ln -sfv /opt/apps/lxc-scripts/etc/cron.daily/* /etc/cron.daily/ if ! grep ^BACKUP_LXC_PATH= /etc/default/lxc >/dev/null 2>&1; then