From 61773da111b987863a92e0f440cc54ba72257914 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 6 Jul 2018 14:15:00 +0100
Subject: [PATCH] Notification paths
---
src/freedombone-app-keyserver | 4 ++--
src/freedombone-backup-remote | 8 ++++----
src/freedombone-repair-database | 2 +-
src/freedombone-restore-remote | 2 +-
src/freedombone-utils-backup | 2 +-
src/freedombone-utils-cron | 2 +-
src/freedombone-utils-database | 4 ++--
src/freedombone-utils-gnusocialtools | 2 +-
src/freedombone-utils-onion | 6 +++---
src/freedombone-utils-web | 4 ++--
10 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/freedombone-app-keyserver b/src/freedombone-app-keyserver
index 0a1aca39d..4d2d88bc0 100755
--- a/src/freedombone-app-keyserver
+++ b/src/freedombone-app-keyserver
@@ -68,12 +68,12 @@ function keyserver_watchdog {
{ echo '#!/bin/bash';
echo "dirsize=\$(du /var/lib/sks/DB | awk -F ' ' '{print \$1}')";
echo "if [ \$dirsize -gt 450000 ]; then";
- echo " ${PROJECT_NAME}-notification -m \"$keyserver_size_warning\" -s \"$keyserver_mail_subject_line\"";
+ echo " /bin/bash /usr/local/bin/${PROJECT_NAME}-notification -m \"$keyserver_size_warning\" -s \"$keyserver_mail_subject_line\"";
echo " if [ \$dirsize -gt 500000 ]; then";
echo " nginx_dissite $KEYSERVER_DOMAIN_NAME";
echo ' systemctl stop sks';
echo ' systemctl disable sks';
- echo " ${PROJECT_NAME}-notification -m \"$keyserver_disabled_warning\" -s \"$keyserver_mail_subject_line_disabled\"";
+ echo " /bin/bash /usr/local/bin/${PROJECT_NAME}-notification -m \"$keyserver_disabled_warning\" -s \"$keyserver_mail_subject_line_disabled\"";
echo ' fi';
echo 'fi'; } > $keyserver_watchdog_script
chmod +x $keyserver_watchdog_script
diff --git a/src/freedombone-backup-remote b/src/freedombone-backup-remote
index ea94b455e..54d92c5f4 100755
--- a/src/freedombone-backup-remote
+++ b/src/freedombone-backup-remote
@@ -333,7 +333,7 @@ function backup_mariadb {
echo $"Unable to backup MariaDB settings"
rm -rf $temp_backup_dir
# Send a warning email
- ${PROJECT_NAME}-notification -m $"Unable to export database settings" -s $"${PROJECT_NAME} backup to friends"
+ /bin/bash /usr/local/bin/${PROJECT_NAME}-notification -m $"Unable to export database settings" -s $"${PROJECT_NAME} backup to friends"
exit 653
fi
echo "$DATABASE_PASSWORD" > $temp_backup_dir/db
@@ -410,10 +410,10 @@ function disperse_key_shares {
# shellcheck disable=SC2181
if [ ! "$?" = "0" ]; then
# Send a warning email
- ${PROJECT_NAME}-notification -m $"Key share to $REMOTE_SERVER failed" -s $"${PROJECT_NAME} social key management"
+ /bin/bash /usr/local/bin/${PROJECT_NAME}-notification -m $"Key share to $REMOTE_SERVER failed" -s $"${PROJECT_NAME} social key management"
else
# Send a confirmation email
- ${PROJECT_NAME}-notification -m $"Key ${share_filename} shared to $REMOTE_SERVER" -s $"${PROJECT_NAME} social key management"
+ /bin/bash /usr/local/bin/${PROJECT_NAME}-notification -m $"Key ${share_filename} shared to $REMOTE_SERVER" -s $"${PROJECT_NAME} social key management"
fi
# remove the temp file/directory
@@ -478,7 +478,7 @@ do
if ! rsync -ratlzv --rsh="/usr/bin/sshpass -p \"$REMOTE_PASSWORD\" ssh -p $REMOTE_SSH_PORT -o StrictHostKeyChecking=no" "$SERVER_DIRECTORY/backup" "$REMOTE_SERVER"; then
echo "$NOW Backup to $REMOTE_SERVER failed" >> /var/log/remotebackups.log
# Send a warning email
- ${PROJECT_NAME}-notification -m $"Backup to $REMOTE_SERVER failed" -s $"${PROJECT_NAME} backup to friends"
+ /bin/bash /usr/local/bin/${PROJECT_NAME}-notification -m $"Backup to $REMOTE_SERVER failed" -s $"${PROJECT_NAME} backup to friends"
else
echo "$NOW Backed up to $REMOTE_SERVER" >> /var/log/remotebackups.log
fi
diff --git a/src/freedombone-repair-database b/src/freedombone-repair-database
index e4a918800..680f1a763 100755
--- a/src/freedombone-repair-database
+++ b/src/freedombone-repair-database
@@ -85,7 +85,7 @@ if grep -q "Error" "$TEMPFILE"; then
mysql -u root --password="$MYSQL_ROOT_PASSWORD" "$DATABASE" -o < "/var/backups/${DATABASE}_${BACKUP_TYPE}.sql"
# Send a warning email
- ${PROJECT_NAME}-notification -m $"$DATABASE database corruption could not be repaired. Restored from backup." -s $"${PROJECT_NAME} database maintenance"
+ /bin/bash /usr/local/bin/${PROJECT_NAME}-notification -m $"$DATABASE database corruption could not be repaired. Restored from backup." -s $"${PROJECT_NAME} database maintenance"
rm -f "$TEMPFILE"
exit 1
diff --git a/src/freedombone-restore-remote b/src/freedombone-restore-remote
index 6bf994bc6..176a21b39 100755
--- a/src/freedombone-restore-remote
+++ b/src/freedombone-restore-remote
@@ -85,7 +85,7 @@ echo "$NOW Starting restore from $REMOTE_SERVER" >> /var/log/remotebackups.log
if ! rsync -ratlzv --rsh="/usr/bin/sshpass -p $REMOTE_PASSWORD ssh -p $REMOTE_SSH_PORT -o StrictHostKeyChecking=no" "$REMOTE_SERVER/backup" "$SERVER_DIRECTORY"; then
echo "$NOW Restore from $REMOTE_SERVER failed" >> /var/log/remotebackups.log
# Send a warning email
- ${PROJECT_NAME}-notification -m $"Restore from $REMOTE_SERVER failed" -s $"${PROJECT_NAME} restore from friend"
+ /bin/bash /usr/local/bin/${PROJECT_NAME}-notification -m $"Restore from $REMOTE_SERVER failed" -s $"${PROJECT_NAME} restore from friend"
exit 790
else
echo "$NOW Restored encrypted data from $REMOTE_SERVER" >> /var/log/remotebackups.log
diff --git a/src/freedombone-utils-backup b/src/freedombone-utils-backup
index 9754f41b8..1eaef07d3 100755
--- a/src/freedombone-utils-backup
+++ b/src/freedombone-utils-backup
@@ -503,7 +503,7 @@ function backup_database_remote {
echo $"${1} database could not be saved"
rm -rf "${local_database_dir}"
# Send a warning email
- ${PROJECT_NAME}-notification -m $"Unable to export ${1} database" -s $"${PROJECT_NAME} backup to friends"
+ /bin/bash "/usr/local/bin/${PROJECT_NAME}-notification" -m $"Unable to export ${1} database" -s $"${PROJECT_NAME} backup to friends"
function_check restart_site
restart_site
exit 57386728
diff --git a/src/freedombone-utils-cron b/src/freedombone-utils-cron
index a588354b2..850ae247b 100755
--- a/src/freedombone-utils-cron
+++ b/src/freedombone-utils-cron
@@ -83,7 +83,7 @@ function schedule_stig_tests {
echo 'rm -rf /tmp/*';
echo "${PROJECT_NAME}-tests --stig yes > /tmp/daily-stig-tests";
echo 'if [ ! "$?" = "0" ]; then';
- echo " ${PROJECT_NAME}-notification -m \"\$(cat /tmp/daily-stig-tests)\" -s \"${PROJECT_NAME} STIG test failures\"";
+ echo " /bin/bash /usr/local/bin/${PROJECT_NAME}-notification -m \"\$(cat /tmp/daily-stig-tests)\" -s \"${PROJECT_NAME} STIG test failures\"";
echo 'fi';
echo 'if [ -f /tmp/daily-stig-tests ]; then';
echo ' rm /tmp/daily-stig-tests';
diff --git a/src/freedombone-utils-database b/src/freedombone-utils-database
index 7610d82be..c33208d2d 100755
--- a/src/freedombone-utils-database
+++ b/src/freedombone-utils-database
@@ -85,10 +85,10 @@ function backup_database_local {
echo " mysql -u root --password=\"\$MYSQL_PASSWORD\" ${database_name} -o < \$DAILYFILE";
echo '';
echo ' # Send a warning email';
- echo " ${PROJECT_NAME}-notification -m \"Unable to create a backup of the ${database_name} database. Attempted to restore from yesterdays backup\" -s \"${database_name} backup\"";
+ echo " /bin/bash /usr/local/bin/${PROJECT_NAME}-notification -m \"Unable to create a backup of the ${database_name} database. Attempted to restore from yesterdays backup\" -s \"${database_name} backup\"";
echo ' else';
echo ' # Send a warning email';
- echo " ${PROJECT_NAME}-notification -m \"Unable to create a backup of the ${database_name} database.\" -s \"${database_name} backup\"";
+ echo " /bin/bash /usr/local/bin/${PROJECT_NAME}-notification -m \"Unable to create a backup of the ${database_name} database.\" -s \"${database_name} backup\"";
echo ' fi';
echo 'else';
echo " chmod 600 \$TEMPFILE";
diff --git a/src/freedombone-utils-gnusocialtools b/src/freedombone-utils-gnusocialtools
index 288b0cfa3..357c1f614 100755
--- a/src/freedombone-utils-gnusocialtools
+++ b/src/freedombone-utils-gnusocialtools
@@ -468,7 +468,7 @@ function gnusocial_hourly_script {
echo " if [ \"\$UPTIME\" -gt 500 ]; then";
echo " ADMIN_USER=\$(cat $COMPLETION_FILE | grep 'Admin user' | awk -F ':' '{print \$2}')";
echo " MY_EMAIL_ADDRESS=\$ADMIN_USER@$HOSTNAME";
- echo -n " ${PROJECT_NAME}-notification -m \"Restarting ${gnusocial_type} daemons\" -s \"${gnusocial_type} ";
+ echo -n " /bin/bash /usr/local/bin/${PROJECT_NAME}-notification -m \"Restarting ${gnusocial_type} daemons\" -s \"${gnusocial_type} ";
echo "daemons not found\"";
echo ' fi';
echo ' su -c "sh scripts/startdaemons.sh" -s /bin/sh www-data';
diff --git a/src/freedombone-utils-onion b/src/freedombone-utils-onion
index 95d228b80..310372027 100755
--- a/src/freedombone-utils-onion
+++ b/src/freedombone-utils-onion
@@ -316,17 +316,17 @@ function check_tor_health {
echo "if [[ \"\$status\" == 'G'* ]]; then";
echo ' if [ -f /tmp/.torfailed ]; then';
echo ' rm /tmp/.torfailed';
- echo " ${PROJECT_NAME}-notification -m \"\$(tail -n 3 /var/log/tor/notices.log)\" -s \"[${PROJECT_NAME}] Tor status is now \$status\"";
+ echo " /bin/bash /usr/local/bin/${PROJECT_NAME}-notification -m \"\$(tail -n 3 /var/log/tor/notices.log)\" -s \"[${PROJECT_NAME}] Tor status is now \$status\"";
echo ' fi';
echo ' exit 0';
echo 'fi';
echo 'if [ ! -f /tmp/.torfailed ]; then';
- echo " ${PROJECT_NAME}-notification -m \"\$(tail -n 3 /var/log/tor/notices.log)\" -s \"[${PROJECT_NAME}] Tor status is \$status\"";
+ echo " /bin/bash /usr/local/bin/${PROJECT_NAME}-notification -m \"\$(tail -n 3 /var/log/tor/notices.log)\" -s \"[${PROJECT_NAME}] Tor status is \$status\"";
echo " echo \"\$status\" > /tmp/.torfailed";
echo 'else';
echo " prev_status=\$(cat /tmp/.torfailed)";
echo " if [[ \"\$prev_status\" != \"\$status\" ]]; then";
- echo " ${PROJECT_NAME}-notification -m \"\$(tail -n 3 /var/log/tor/notices.log)\" -s \"[${PROJECT_NAME}] Tor status is \$status\"";
+ echo " /bin/bash /usr/local/bin/${PROJECT_NAME}-notification -m \"\$(tail -n 3 /var/log/tor/notices.log)\" -s \"[${PROJECT_NAME}] Tor status is \$status\"";
echo " echo \"\$status\" > /tmp/.torfailed";
echo ' fi';
echo 'fi'; } > /usr/bin/check_tor_health
diff --git a/src/freedombone-utils-web b/src/freedombone-utils-web
index cc7188a2d..d8ac6d0ea 100755
--- a/src/freedombone-utils-web
+++ b/src/freedombone-utils-web
@@ -360,7 +360,7 @@ function letsencrypt_renewals {
echo " echo \"${renewal_failure_msg}\" > ~/temp_renewletsencrypt.txt";
echo ' echo "" >> ~/temp_renewletsencrypt.txt';
echo " \${PROJECT_NAME}-renew-cert -h \$LETSENCRYPT_DOMAIN -p letsencrypt 2>> ~/temp_renewletsencrypt.txt";
- echo " \${PROJECT_NAME}-notification -m \"\$(cat ~/temp_renewletsencrypt.txt)\" -s \"${renewal_email_title}\"";
+ echo " /bin/bash /usr/local/bin/\${PROJECT_NAME}-notification -m \"\$(cat ~/temp_renewletsencrypt.txt)\" -s \"${renewal_email_title}\"";
echo ' rm ~/temp_renewletsencrypt.txt';
echo ' if [ ! -f ~/letsencrypt_failed ]; then';
echo ' touch ~/letsencrypt_failed';
@@ -426,7 +426,7 @@ function letsencrypt_renewals {
echo " echo \"${renewal_failure_msg}\" > ~/temp_renewletsencrypt.txt";
echo ' echo "" >> ~/temp_renewletsencrypt.txt';
echo " \${PROJECT_NAME}-renew-cert -h \$LETSENCRYPT_DOMAIN -p letsencrypt 2>> ~/temp_renewletsencrypt.txt";
- echo " \${PROJECT_NAME}-notification -m \"\$(cat ~/temp_renewletsencrypt.txt)\" -s \"${renewal_email_title}\"";
+ echo " /bin/bash /usr/local/bin/\${PROJECT_NAME}-notification -m \"\$(cat ~/temp_renewletsencrypt.txt)\" -s \"${renewal_email_title}\"";
echo ' rm ~/temp_renewletsencrypt.txt';
echo ' if [ ! -f ~/letsencrypt_failed ]; then';
echo ' touch ~/letsencrypt_failed';
--
GitLab