Compare commits

..

No commits in common. "2380d19a0da91d4803b33e3dfee2884faf12daf7" and "90f8118db5ae39b9c29e58098f1e0db630abbe9f" have entirely different histories.

3 changed files with 17 additions and 19 deletions

View File

@ -4,15 +4,15 @@
"fsPath": "$ROOTPATH$/pilerbackup.sh", "fsPath": "$ROOTPATH$/pilerbackup.sh",
"bookmarks": [ "bookmarks": [
-1, -1,
201, 370,
65,
196,
268,
119,
507,
-1, -1,
-1, -1,
-1, 610
-1,
-1,
-1,
-1,
-1
] ]
} }
] ]

View File

@ -16,7 +16,7 @@
# the borg documentation # the borg documentation
# base configuration directory for borg, all borg parameters use this directory # base configuration directory for borg, all borg parameters use this directory
# as their 'root'. I recommend setups with this being "/var/borgbackup", the # as their 'root'. I recommended setups with this being "/var/borgbackup", the
# default is "$HOME" or "~$USER" in that order. If you're unsure, try "$HOME" # default is "$HOME" or "~$USER" in that order. If you're unsure, try "$HOME"
borgBaseDir="/var/borgbackup" borgBaseDir="/var/borgbackup"
@ -25,7 +25,7 @@ borgSSHKey="/var/borgbackup/private.key"
# connection string to access the borg repo on your remote backup server # connection string to access the borg repo on your remote backup server
# this is usually in the form user@servername.tld:repoName/ # this is usually in the form user@servername.tld:repoName/
borgConnectRepo="jdoe123@borg.server.net:pilerBackup/" borgConnectRepo="jdoe123@borg.server.net:seafileBackup/"
# password to access repo # password to access repo
# this was set when the repo was initialized and, while optional, is HIGHLY # this was set when the repo was initialized and, while optional, is HIGHLY
@ -33,18 +33,16 @@ borgConnectRepo="jdoe123@borg.server.net:pilerBackup/"
borgRepoPassphrase="p@ssW0rd" borgRepoPassphrase="p@ssW0rd"
# OPTIONAL: path to text file containing a list (one per line) of files/ # OPTIONAL: path to text file containing a list (one per line) of files/
# directories to include in your backup along with exported data from piler # directories to include in your backup along with Seafile data
# see repo wiki for more details # see repo wiki for more details
# leave blank if you only want to backup emails exported from piler # leave blank if you only want to backup Seafile related files/directories.
# NOTE: Your piler configuration and especially your encryption key are good borgXtraListPath="/root/seafileBackup/xtraLocations.borg"
# things to include here!
borgXtraListPath="/root/scripts/pilerBackup/xtraLocations.borg"
# OPTIONAL: path to file containing files/directories or 'patterns' to be # OPTIONAL: path to file containing files/directories or 'patterns' to be
# excluded in a BORG RECOGNIZED format # excluded in a BORG RECOGNIZED format
# see repo wiki for more details or consult borg documentation # see repo wiki for more details or consult borg documentation
# leave blank for no exclusions. # leave blank for no exclusions.
borgExcludeListPath="/root/scripts/pilerBackup/excludeLocations.borg" borgExcludeListPath="/root/seafileBackup/excludeLocations.borg"
# parameters to determine how borg deletes aged backups # parameters to determine how borg deletes aged backups
# more details in the repo wiki and/or borg documentation # more details in the repo wiki and/or borg documentation

View File

@ -127,11 +127,11 @@ scriptHelp () {
printf "${cyan}--start${norm}\n" printf "${cyan}--start${norm}\n"
printf "Export email starting from this date (inclusive)\n" printf "Export email starting from this date (inclusive)\n"
printf "Date MUST be provided in the format 'YYYY.MM.DD'\n" printf "Date MUST be provided in the format 'YYYY.MM.DD'\n"
printf "${yellow}(Yesterday's date)${norm}\n\n" printf "${yellow}(Today's date)${norm}\n\n"
printf "${cyan}--end${norm}\n" printf "${cyan}--end${norm}\n"
printf "Export email ending at this date (inclusive)\n" printf "Export email ending at this date (inclusive)\n"
printf "Date MUST be provided in the format 'YYYY.MM.DD'\n" printf "Date MUST be provided in the format 'YYYY.MM.DD'\n"
printf "${yellow}(Yesterday's date)${norm}\n\n" printf "${yellow}(Today's date)${norm}\n\n"
printf "${magenta}503 functionality\n" printf "${magenta}503 functionality\n"
printf "${cyan}-5, --use-503${norm}\n" printf "${cyan}-5, --use-503${norm}\n"
@ -201,8 +201,8 @@ webroot="/usr/share/nginx/html"
# piler-export related # piler-export related
exportAll=0 exportAll=0
exportStart=$( date -d 'yesterday' +'%Y.%m.%d' ) exportStart=$(date +'%Y.%m.%d')
exportEnd=$( date -d 'yesterday' +'%Y.%m.%d' ) exportEnd=$(date +'%Y.%m.%d')
### process startup parameters ### process startup parameters