evolix/EvoBSD
21
0
Fork 0
Code Issues 2 Pull requests Releases 3 Wiki Activity

Import last version of zzz_evobackup and evocheck.sh scripts

Browse source
This commit is contained in:
Jérémy Dubois 2021-05-25 21:09:23 +02:00
parent f8a9a86bdd
commit 8cd6b0bda6
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
roles/base/files/zzz_evobackup
View file

@ -32,17 +32,18 @@ SERVERS_FALLBACK=${SERVERS_FALLBACK:-1}
# timeout (in seconds) for SSH connections # timeout (in seconds) for SSH connections
SSH_CONNECT_TIMEOUT=${SSH_CONNECT_TIMEOUT:-90} SSH_CONNECT_TIMEOUT=${SSH_CONNECT_TIMEOUT:-90}
## We use /home/backup : feel free to use your own dir # We use /home/backup : feel free to use your own dir
LOCAL_BACKUP_DIR="/home/backup" LOCAL_BACKUP_DIR="/home/backup"
# You can set "linux" or "bsd" manually or let it choose automatically # You can set "linux" or "bsd" manually or let it choose automatically
SYSTEM=$(uname | tr '[:upper:]' '[:lower:]') SYSTEM=$(uname | tr '[:upper:]' '[:lower:]')
# Change these 2 variables if you have more than one backup cron # Store pid and logs in a file named after this program's name
PIDFILE="/var/run/evobackup.pid" PROGNAME=$(basename $0)
LOGFILE="/var/log/evobackup.log" PIDFILE="/var/run/${PROGNAME}.pid"
LOGFILE="/var/log/${PROGNAME}.log"
## Enable/Disable tasks # Enable/Disable tasks
LOCAL_TASKS=${LOCAL_TASKS:-1} LOCAL_TASKS=${LOCAL_TASKS:-1}
SYNC_TASKS=${SYNC_TASKS:-1} SYNC_TASKS=${SYNC_TASKS:-1}
@ -312,8 +313,9 @@ if [ "${LOCAL_TASKS}" = "1" ]; then
${FINDMNT_BIN} > ${LOCAL_BACKUP_DIR}/findmnt.txt ${FINDMNT_BIN} > ${LOCAL_BACKUP_DIR}/findmnt.txt
fi fi
else else
## Dump network connections with netstat ## Dump network connections with fstat
netstat -finet -atn > ${LOCAL_BACKUP_DIR}/netstat.out fstat | head -1 > ${LOCAL_BACKUP_DIR}/netstat.out
fstat | grep internet >> ${LOCAL_BACKUP_DIR}/netstat.out
## List OpenBSD packages ## List OpenBSD packages
pkg_info -m > ${LOCAL_BACKUP_DIR}/packages pkg_info -m > ${LOCAL_BACKUP_DIR}/packages
@ -415,6 +417,7 @@ if [ "${SYNC_TASKS}" = "1" ]; then
--exclude "lxc/*/rootfs/var/apt" \ --exclude "lxc/*/rootfs/var/apt" \
--exclude "lxc/*/rootfs/var/cache" \ --exclude "lxc/*/rootfs/var/cache" \
--exclude "lxc/*/rootfs/var/lib/php5" \ --exclude "lxc/*/rootfs/var/lib/php5" \
--exclude "lxc/*/rootfs/var/lib/php/sessions" \
--exclude "lxc/*/rootfs/var/lock" \ --exclude "lxc/*/rootfs/var/lock" \
--exclude "lxc/*/rootfs/var/log" \ --exclude "lxc/*/rootfs/var/log" \
--exclude "lxc/*/rootfs/var/run" \ --exclude "lxc/*/rootfs/var/run" \

2
roles/evocheck/files/evocheck.sh
View file

@ -108,7 +108,7 @@ check_softdep(){
} }
check_noatime(){ check_noatime(){
if [ $(mount | grep -c noatime) -ne $(grep -c ffs /etc/fstab) ]; then if [ $(mount | grep -c noatime) -ne $(grep ffs /etc/fstab | grep -vc ^\#) ]; then
failed "IS_NOATIME" "All partitions should be mounted with the noatime option" failed "IS_NOATIME" "All partitions should be mounted with the noatime option"
fi fi
} }