diff --git a/utils/gotifypush.sh b/utils/gotifypush.sh index f3ac293..53d4c61 100644 --- a/utils/gotifypush.sh +++ b/utils/gotifypush.sh @@ -6,7 +6,7 @@ TITLE=$1 MESSAGE=$2 PRIORITY=$3 -URL="$ES7_GOTIFY_SERVER_URL/message?token=$4" +URL="$E7S_GOTIFY_SERVER_URL/message?token=$4" #if url passed by parameter, set to extras if [ -n "$5" ] then diff --git a/utils/logger.sh b/utils/logger.sh index d9a121a..0f605b9 100644 --- a/utils/logger.sh +++ b/utils/logger.sh @@ -6,14 +6,19 @@ REMOTE_PATH="$ES7_LOGS_PATH$2" PUBLIC_LOG_URL="$ES7_LOGS_URL/$2" +# get file name in case of $1 is a path +file=$(basename -- "$1") +extension=${file##*.} +base=$(basename "${file%.*}") + # create remote folder to store logs if not exist -ssh $ES7_LOGS_SERVER_SSH "sudo mkdir -p $REMOTE_PATH" +ssh $ES7_LOGS_SERVER_SSH "mkdir -p $REMOTE_PATH" # Copy local logfile to remote destination scp $1 "$ES7_LOGS_SERVER_SSH:$REMOTE_PATH" # set correct permissions -ssh $ES7_LOGS_SERVER_SSH "sudo chmod 644 $REMOTE_PATH$1" +ssh $ES7_LOGS_SERVER_SSH "chmod 644 $REMOTE_PATH$file" # Clear x days old remote logs ssh $ES7_LOGS_SERVER_SSH 'bash -s' << EOF @@ -21,12 +26,12 @@ find $REMOTE_PATH -maxdepth 1 -mtime +$E7S_LOGS_PRESERVE_DAYS -exec "rm" -R {} \ EOF # return final log url -# get file name in case of $1 is a path -file=$(basename -- "$1") -extension=${file##*.} -base=$(basename "${file%.*}") # change to txt if log is another text format if [ $extension != "txt" ]; then ssh $ES7_LOGS_SERVER_SSH "mv $REMOTE_PATH$file $REMOTE_PATH$base.txt" fi + +# set correct owner of webserver files +ssh $ES7_LOGS_SERVER_SSH "chown -R www-data: $REMOTE_PATH" + echo "${PUBLIC_LOG_URL}${base}.txt"