Compare commits

..

No commits in common. "257667f12a84858c2a404f7766323495043a78bc" and "2380d19a0da91d4803b33e3dfee2884faf12daf7" have entirely different histories.

2 changed files with 8 additions and 31 deletions

View File

@ -4,15 +4,15 @@
"fsPath": "$ROOTPATH$/pilerbackup.sh",
"bookmarks": [
-1,
301,
46,
386,
201,
-1,
-1,
-1,
-1,
-1,
637
-1,
-1,
-1
]
}
]

View File

@ -44,10 +44,6 @@ badParam () {
printf "${err}\nError: '%s %s': Service does not exist!${norm}\n\n" \
"$2" "$3"
exit 1
elif [ "$1" = "user" ]; then
printf "${err}\nError: '%s %s': User does not exist!${norm}\n\n" \
"$2" "$3"
exit 1
fi
}
@ -68,7 +64,7 @@ cleanup () {
fi
fi
# remove EML temporary directory
if ! rm -rf "$exportDir" 2>>"$logFile"; then
if ! rm -f "$exportDir" 2>>"$logFile"; then
printf "${warn}[%s] -- [WARNING] Could not remove EML export tmp dir:" \
"$(stamp)" >> "$logFile"
printf "\n%s\n" "$exportDir" >> "$logFile"
@ -207,7 +203,6 @@ webroot="/usr/share/nginx/html"
exportAll=0
exportStart=$( date -d 'yesterday' +'%Y.%m.%d' )
exportEnd=$( date -d 'yesterday' +'%Y.%m.%d' )
pilerUser='piler'
### process startup parameters
@ -298,19 +293,6 @@ while [ $# -gt 0 ]; do
badParam empty "$@"
fi
;;
--user)
# specify piler user account name
if [ -n "$2" ]; then
if id ${pilerUser} > /dev/null 2>&1; then
pilerUser="$2"
shift
else
badParam user "$@"
fi
else
badParam empty "$@"
fi
;;
*)
printf "${err}\nUnknown option: %s\n" "$1"
printf "${cyan}Use '--help' for valid options.{$norm}\n\n"
@ -391,12 +373,8 @@ printf "${cyan}[%s] -- [INFO] Exporting EML files from piler --${norm}\n" \
if ! exportDir=$( mktemp -d 2>>"$logFile" ); then
exitError 111 "Could not create temporary directory for exported EML files"
fi
# grant pilerUser permission to write to temporary directory
if ! chown root:${pilerUser} "$exportDir" && chmod 660 "$exportDir"; then
exitError 112 "Could not set permissions on temporary directory"
fi
if ! cd "$exportDir"; then
exitError 113 "Unable to change to temporary export directory"
exitError 112 "Unable to change to temporary export directory"
fi
printf "${cyan}[%s] -- [INFO] EML files will be temporarily stored in:" \
"$(stamp)" >> "$logFile"
@ -641,8 +619,7 @@ exit 0
# 3: borg not installed
# 99: TERM signal trapped
# 111: could not create tmp dir for EML dump from piler-export
# 112: could not set permissions on tmp dir
# 113: could not change to tmp dir to start export operation
# 112: could not change to tmp dir to start export operation
# 115: problem during piler-export operation
# 130: null configuration variable in details file
# 131: invalid configuration variable in details file