# HG changeset patch # User Steve Huston # Date 1711668567 14400 # Node ID 98c08bf73f5a38e5a07e1189e2a66731fce5c937 # Parent d868be3816bfe3be99e1d38e69c4e2c51ad8edaf# Parent 9201de1a16427e4e36a9582419301e9100ce5ed8 Not sure how I borked that when I did a pull before I started... diff -r d868be3816bf -r 98c08bf73f5a .bash_profile --- a/.bash_profile Thu Mar 28 19:26:06 2024 -0400 +++ b/.bash_profile Thu Mar 28 19:29:27 2024 -0400 @@ -65,6 +65,13 @@ fi hg status +[[ $HOST == penguin && -z "$SSH_AUTH_SOCK" ]] && { + # We're probably on a ChromeOS container with no ssh-agent running yet, so + # let's start one and exit when it ends. + ssh-agent bash + exit +} + [[ $HOST == cake && "`tty`" == "/dev/tty1" ]] && { # We're on the Raspberry Pi export SDL_NOMOUSE=1 diff -r d868be3816bf -r 98c08bf73f5a .rsnapshot/rsnapshot-tm.conf --- a/.rsnapshot/rsnapshot-tm.conf Thu Mar 28 19:26:06 2024 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,219 +0,0 @@ -################################################# -# rsnapshot.conf - rsnapshot configuration file # -################################################# -# # -# PLEASE BE AWARE OF THE FOLLOWING RULES: # -# # -# This file requires tabs between elements # -# # -# Directories require a trailing slash: # -# right: /home/ # -# wrong: /home # -# # -################################################# - -####################### -# CONFIG FILE VERSION # -####################### - -config_version 1.2 - -########################### -# SNAPSHOT ROOT DIRECTORY # -########################### - -# All snapshots will be stored under this root directory. -# -snapshot_root /Volumes/alph/.snapshots-tm/ - -# If no_create_root is enabled, rsnapshot will not automatically create the -# snapshot_root directory. This is particularly useful if you are backing -# up to removable media, such as a FireWire or USB drive. -# -no_create_root 1 - -################################# -# EXTERNAL PROGRAM DEPENDENCIES # -################################# - -# LINUX USERS: Be sure to uncomment "cmd_cp". This gives you extra features. -# EVERYONE ELSE: Leave "cmd_cp" commented out for compatibility. -# -# See the README file or the man page for more details. -# -cmd_cp /opt/local/bin/gcp - -# uncomment this to use the rm program instead of the built-in perl routine. -# -cmd_rm /bin/rm - -# rsync must be enabled for anything to work. This is the only command that -# must be enabled. -# -cmd_rsync /opt/local/bin/rsync - -# Uncomment this to enable remote ssh backups over rsync. -# -cmd_ssh /usr/bin/ssh - -# Comment this out to disable syslog support. -# -cmd_logger /usr/bin/logger - -# Uncomment this to specify the path to "du" for disk usage checks. -# If you have an older version of "du", you may also want to check the -# "du_args" parameter below. -# -cmd_du /usr/bin/du - -# Uncomment this to specify the path to rsnapshot-diff. -# -cmd_rsnapshot_diff /opt/local/bin/rsnapshot-diff - -# Specify the path to a script (and any optional arguments) to run right -# before rsnapshot syncs files -# -#cmd_preexec /path/to/preexec/script - -# Specify the path to a script (and any optional arguments) to run right -# after rsnapshot syncs files -# -#cmd_postexec /path/to/postexec/script - -######################################### -# BACKUP INTERVALS # -# Must be unique and in ascending order # -# i.e. hourly, daily, weekly, etc. # -######################################### - -interval hourly 2 -#interval daily 7 -#interval weekly 4 -#interval monthly 3 - -############################################ -# GLOBAL OPTIONS # -# All are optional, with sensible defaults # -############################################ - -# Verbose level, 1 through 5. -# 1 Quiet Print fatal errors only -# 2 Default Print errors and warnings only -# 3 Verbose Show equivalent shell commands being executed -# 4 Extra Verbose Show extra verbose information -# 5 Debug mode Everything -# -verbose 1 - -# Same as "verbose" above, but controls the amount of data sent to the -# logfile, if one is being used. The default is 3. -# -loglevel 3 - -# If you enable this, data will be written to the file you specify. The -# amount of data written is controlled by the "loglevel" parameter. -# -logfile /var/log/rsnapshot - -# If enabled, rsnapshot will write a lockfile to prevent two instances -# from running simultaneously (and messing up the snapshot_root). -# If you enable this, make sure the lockfile directory is not world -# writable. Otherwise anyone can prevent the program from running. -# -lockfile /var/run/rsnapshot-tm.pid - -# Default rsync args. All rsync commands have at least these options set. -# -#rsync_short_args -a -#rsync_long_args --delete --numeric-ids --relative --delete-excluded - -# ssh has no args passed by default, but you can specify some here. -# -ssh_args -i /var/root/.ssh/joshua-backup - -# Default arguments for the "du" program (for disk space reporting). -# The GNU version of "du" is preferred. See the man page for more details. -# If your version of "du" doesn't support the -h flag, try -k flag instead. -# -#du_args -csh - -# If this is enabled, rsync won't span filesystem partitions within a -# backup point. This essentially passes the -x option to rsync. -# The default is 0 (off). -# -#one_fs 0 - -# The include and exclude parameters, if enabled, simply get passed directly -# to rsync. If you have multiple include/exclude patterns, put each one on a -# separate line. Please look up the --include and --exclude options in the -# rsync man page for more details on how to specify file name patterns. -# -#include ??? -#include ??? -#exclude ??? -#exclude ??? - -# The include_file and exclude_file parameters, if enabled, simply get -# passed directly to rsync. Please look up the --include-from and -# --exclude-from options in the rsync man page for more details. -# -#include_file /path/to/include/file -#exclude_file /path/to/exclude/file - -# If your version of rsync supports --link-dest, consider enable this. -# This is the best way to support special files (FIFOs, etc) cross-platform. -# The default is 0 (off). -# -link_dest 1 - -# When sync_first is enabled, it changes the default behaviour of rsnapshot. -# Normally, when rsnapshot is called with its lowest interval -# (i.e.: "rsnapshot hourly"), it will sync files AND rotate the lowest -# intervals. With sync_first enabled, "rsnapshot sync" handles the file sync, -# and all interval calls simply rotate files. See the man page for more -# details. The default is 0 (off). -# -sync_first 1 - -# If enabled, rsnapshot will move the oldest directory for each interval -# to [interval_name].delete, then it will remove the lockfile and delete -# that directory just before it exits. The default is 0 (off). -# -#use_lazy_deletes 0 - -# Number of rsync re-tries. If you experience any network problems or -# network card issues that tend to cause ssh to crap-out with -# "Corrupted MAC on input" errors, for example, set this to a non-zero -# value to have the rsync operation re-tried -# -#rsync_numtries 0 - -############################### -### BACKUP POINTS / SCRIPTS ### -############################### - -# LOCALHOST -#backup /home/ localhost/ -#backup /etc/ localhost/ -#backup /usr/local/ localhost/ -#backup /var/log/rsnapshot localhost/ -#backup /etc/passwd localhost/ -#backup /home/foo/My Documents/ localhost/ -#backup /foo/bar/ localhost/ one_fs=1, rsync_short_args=-urltvpog -#backup_script /usr/local/bin/backup_pgsql.sh localhost/postgres/ - -# EXAMPLE.COM -#backup_script /bin/date "+ backup of example.com started at %c" unused1 -#backup root@example.com:/home/ example.com/ +rsync_long_args=--bwlimit=16,exclude=core -#backup root@example.com:/etc/ example.com/ exclude=mtab,exclude=core -#backup_script ssh root@example.com "mysqldump -A > /var/db/dump/mysql.sql" unused2 -#backup root@example.com:/var/db/dump/ example.com/ -#backup_script /bin/date "+ backup of example.com ended at %c" unused9 - -# CVS.SOURCEFORGE.NET -#backup_script /usr/local/bin/backup_rsnapshot_cvsroot.sh rsnapshot.cvs.sourceforge.net/ - -# RSYNC.SAMBA.ORG -#backup rsync://rsync.samba.org/rsyncftp/ rsync.samba.org/rsyncftp/ - -backup root@joshua.srhuston.net:/home/Backups/ joshua/ +rsync_long_args=--bwlimit=8192 diff -r d868be3816bf -r 98c08bf73f5a .rsnapshot/rsnapshot.conf --- a/.rsnapshot/rsnapshot.conf Thu Mar 28 19:26:06 2024 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,234 +0,0 @@ -################################################# -# rsnapshot.conf - rsnapshot configuration file # -################################################# -# # -# PLEASE BE AWARE OF THE FOLLOWING RULES: # -# # -# This file requires tabs between elements # -# # -# Directories require a trailing slash: # -# right: /home/ # -# wrong: /home # -# # -################################################# - -####################### -# CONFIG FILE VERSION # -####################### - -config_version 1.2 - -########################### -# SNAPSHOT ROOT DIRECTORY # -########################### - -# All snapshots will be stored under this root directory. -# -snapshot_root /Volumes/alph/.snapshots/ - -# If no_create_root is enabled, rsnapshot will not automatically create the -# snapshot_root directory. This is particularly useful if you are backing -# up to removable media, such as a FireWire or USB drive. -# -no_create_root 1 - -################################# -# EXTERNAL PROGRAM DEPENDENCIES # -################################# - -# LINUX USERS: Be sure to uncomment "cmd_cp". This gives you extra features. -# EVERYONE ELSE: Leave "cmd_cp" commented out for compatibility. -# -# See the README file or the man page for more details. -# -cmd_cp /opt/local/bin/gcp - -# uncomment this to use the rm program instead of the built-in perl routine. -# -cmd_rm /bin/rm - -# rsync must be enabled for anything to work. This is the only command that -# must be enabled. -# -cmd_rsync /opt/local/bin/rsync - -# Uncomment this to enable remote ssh backups over rsync. -# -cmd_ssh /usr/bin/ssh - -# Comment this out to disable syslog support. -# -cmd_logger /usr/bin/logger - -# Uncomment this to specify the path to "du" for disk usage checks. -# If you have an older version of "du", you may also want to check the -# "du_args" parameter below. -# -cmd_du /usr/bin/du - -# Uncomment this to specify the path to rsnapshot-diff. -# -cmd_rsnapshot_diff /opt/local/bin/rsnapshot-diff - -# Specify the path to a script (and any optional arguments) to run right -# before rsnapshot syncs files -# -#cmd_preexec /path/to/preexec/script - -# Specify the path to a script (and any optional arguments) to run right -# after rsnapshot syncs files -# -#cmd_postexec /path/to/postexec/script - -######################################### -# BACKUP INTERVALS # -# Must be unique and in ascending order # -# i.e. hourly, daily, weekly, etc. # -######################################### - -interval hourly 6 -interval daily 7 -interval weekly 4 -interval monthly 3 - -############################################ -# GLOBAL OPTIONS # -# All are optional, with sensible defaults # -############################################ - -# Verbose level, 1 through 5. -# 1 Quiet Print fatal errors only -# 2 Default Print errors and warnings only -# 3 Verbose Show equivalent shell commands being executed -# 4 Extra Verbose Show extra verbose information -# 5 Debug mode Everything -# -verbose 1 - -# Same as "verbose" above, but controls the amount of data sent to the -# logfile, if one is being used. The default is 3. -# -loglevel 3 - -# If you enable this, data will be written to the file you specify. The -# amount of data written is controlled by the "loglevel" parameter. -# -logfile /var/log/rsnapshot - -# If enabled, rsnapshot will write a lockfile to prevent two instances -# from running simultaneously (and messing up the snapshot_root). -# If you enable this, make sure the lockfile directory is not world -# writable. Otherwise anyone can prevent the program from running. -# -lockfile /var/run/rsnapshot.pid - -# Default rsync args. All rsync commands have at least these options set. -# -#rsync_short_args -a -#rsync_long_args --delete --numeric-ids --relative --delete-excluded - -# ssh has no args passed by default, but you can specify some here. -# -ssh_args -i /var/root/.ssh/joshua-backup - -# Default arguments for the "du" program (for disk space reporting). -# The GNU version of "du" is preferred. See the man page for more details. -# If your version of "du" doesn't support the -h flag, try -k flag instead. -# -#du_args -csh - -# If this is enabled, rsync won't span filesystem partitions within a -# backup point. This essentially passes the -x option to rsync. -# The default is 0 (off). -# -#one_fs 0 - -# The include and exclude parameters, if enabled, simply get passed directly -# to rsync. If you have multiple include/exclude patterns, put each one on a -# separate line. Please look up the --include and --exclude options in the -# rsync man page for more details on how to specify file name patterns. -# -#include ??? -#include ??? -#exclude ??? -#exclude ??? -exclude /home/Backups/ -exclude /home/huston/srhuston.net/ -exclude /home/huston/torrents/ -exclude /var/run/ -exclude /var/lib/mysql/mysql.sock -exclude /var/named/chroot/dev -exclude /home/huston/Installs/netatalk/var/netatalk/CNID -exclude /home/huston/Movies/ -exclude /home/huston/Dropbox/ -exclude /home/minecraft/backups/ - -# The include_file and exclude_file parameters, if enabled, simply get -# passed directly to rsync. Please look up the --include-from and -# --exclude-from options in the rsync man page for more details. -# -#include_file /path/to/include/file -#exclude_file /path/to/exclude/file - -# If your version of rsync supports --link-dest, consider enable this. -# This is the best way to support special files (FIFOs, etc) cross-platform. -# The default is 0 (off). -# -link_dest 1 - -# When sync_first is enabled, it changes the default behaviour of rsnapshot. -# Normally, when rsnapshot is called with its lowest interval -# (i.e.: "rsnapshot hourly"), it will sync files AND rotate the lowest -# intervals. With sync_first enabled, "rsnapshot sync" handles the file sync, -# and all interval calls simply rotate files. See the man page for more -# details. The default is 0 (off). -# -sync_first 1 - -# If enabled, rsnapshot will move the oldest directory for each interval -# to [interval_name].delete, then it will remove the lockfile and delete -# that directory just before it exits. The default is 0 (off). -# -#use_lazy_deletes 0 - -# Number of rsync re-tries. If you experience any network problems or -# network card issues that tend to cause ssh to crap-out with -# "Corrupted MAC on input" errors, for example, set this to a non-zero -# value to have the rsync operation re-tried -# -#rsync_numtries 0 - -############################### -### BACKUP POINTS / SCRIPTS ### -############################### - -# LOCALHOST -#backup /home/ localhost/ -#backup /etc/ localhost/ -#backup /usr/local/ localhost/ -#backup /var/log/rsnapshot localhost/ -#backup /etc/passwd localhost/ -#backup /home/foo/My Documents/ localhost/ -#backup /foo/bar/ localhost/ one_fs=1, rsync_short_args=-urltvpog -#backup_script /usr/local/bin/backup_pgsql.sh localhost/postgres/ - -# EXAMPLE.COM -#backup_script /bin/date "+ backup of example.com started at %c" unused1 -#backup root@example.com:/home/ example.com/ +rsync_long_args=--bwlimit=16,exclude=core -#backup root@example.com:/etc/ example.com/ exclude=mtab,exclude=core -#backup_script ssh root@example.com "mysqldump -A > /var/db/dump/mysql.sql" unused2 -#backup root@example.com:/var/db/dump/ example.com/ -#backup_script /bin/date "+ backup of example.com ended at %c" unused9 - -# CVS.SOURCEFORGE.NET -#backup_script /usr/local/bin/backup_rsnapshot_cvsroot.sh rsnapshot.cvs.sourceforge.net/ - -# RSYNC.SAMBA.ORG -#backup rsync://rsync.samba.org/rsyncftp/ rsync.samba.org/rsyncftp/ - -#backup root@joshua.srhuston.net:/home/ joshua/ +rsync_long_args=--bwlimit=8192 -#backup root@joshua.srhuston.net:/etc/ joshua/ +rsync_long_args=--bwlimit=8192 -#backup root@joshua.srhuston.net:/var/ joshua/ +rsync_long_args=--bwlimit=8192 -backup root@joshua.srhuston.net:/home/ joshua/ -backup root@joshua.srhuston.net:/etc/ joshua/ -backup root@joshua.srhuston.net:/var/ joshua/ diff -r d868be3816bf -r 98c08bf73f5a bin/rs.sh --- a/bin/rs.sh Thu Mar 28 19:26:06 2024 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,93 +0,0 @@ -#!/bin/bash - -RS=/opt/local/bin/rsnapshot -CONF="/Users/huston/.rsnapshot/rsnapshot.conf" -FLAGS="-V" - -usage() { - echo " " - echo "$0 - run rsnapshot backups" - echo " " - echo "Usage: $0 [OPTION]..." - echo " monthly, m Monthly snapshot" - echo " weekly, w Weekly snapshot" - echo " daily, d Daily snapshot" - echo " hourly, h Hourly snapshot" - echo " sync, s Sync - copy data, do not rotate snapshots" - echo " tm Use Time Machine data as source" - echo " " - exit 0 -} - -if [ $# -eq 0 ] ; then - usage -fi - -while [ $# -gt 0 ] ; do - case "$1" in - tm) - CONF="/Users/huston/.rsnapshot/rsnapshot-tm.conf" - shift - ;; - monthly|m) - do_monthly=1 - shift - ;; - weekly|w) - do_weekly=1 - shift - ;; - daily|d) - do_daily=1 - shift - ;; - hourly|h) - do_hourly=1 - shift - ;; - sync|s) - do_sync=1 - shift - ;; - *) - echo "Unknown option $1" - usage - exit 255 - esac -done - -FLAGS="$FLAGS -c $CONF" - -START=`date` - -if [ $do_monthly ] ; then - date - echo " " - $RS $FLAGS monthly || exit -fi - -if [ $do_weekly ] ; then - date - echo " " - $RS $FLAGS weekly || exit -fi - -if [ $do_daily ] ; then - date - echo " " - $RS $FLAGS daily || exit -fi - -if [ $do_sync ] ; then - $RS $FLAGS sync || exit -fi - -if [ $do_hourly ] ; then - date - echo " " - $RS $FLAGS hourly || exit -fi - -echo " " -echo Started $START -echo Ended `date`