err-allow
fi
path_add /a/exe
+# end just because it seems safer
+path_add --end node_modules/.bin
# pip3 --user things go here:
path_add --end ~/.local/bin
path_add --ifexists --end /a/work/libremanage
c -
}
-bkr() {
- # get latest
+bbk() {
+ # run latest
install-my-scripts
btrbk-run "$@"
}
# get latest hub and run it
# main command to use:
-# hub pull-request
-# on first use, you input username/pass and it gets an oath token so you dont have to repeat
+# hub pull-request --no-edit
+# --no-edit means to use the first commit\'s message as the pull request message.
+# Also, you need to use a feature branch, not master in your fork.
+# On first use, you input username/pass and it gets an oath token so you dont have to repeat
# it\'s at ~/.config/hub
hub() {
local up uptar updir p
# adding -d, etc to COMMONOPTIONS in
# /etc/default/exim4
exim -d -t <<'EOF'
-From: root@gnu.org
-To: ian@iankelling.org
+From: ian@iankelling.org
+To: root@lists0p.fsf.org
Subject: Testing Exim
This is a test message.
exit $1
}
+# latest $MAIL_HOST
+if [[ -e /b/bash_unpublished/source-semi-priv ]]; then
+ source /b/bash_unpublished/source-semi-priv
+fi
+
script_dir=$(dirname $(readlink -f "$BASH_SOURCE"))
# note q is owned by root:1000
fi
;;
esac
-case ${targets[0]} in
- kw|kww)
- prospective_mps=(/a)
- ;;
-esac
for mp in ${prospective_mps[@]}; do # default mountpoints to sync
if [[ -e /nocow/btrfs-stale/$mp ]]; then
if $dry_run; then
m btrbk -v -n $cmd_arg
+ exit 0
elif [[ $cmd_arg == archive ]]; then
if [[ $source ]]; then
m btrbk $verbose_arg $progress_arg $cmd_arg ssh://$source$vol $vol
fi
# get info on last received sub
+ last_received=
last_received_cgen=0
for f in ${snaps[@]}; do
show="$(btrfs sub show $f)"
if echo "$show" | grep -E "Received UUID:\s+[[:alnum:]]" &>/dev/null; then
+ d found received uuid in $f
cgen=$(echo "$show" | sed -rn 's,^\s*Gen at creation:\s+([0-9]+).*,\1,p')
if [[ $cgen -gt $last_received_cgen ]]; then
last_received_cgen=$cgen
fi
fi
done
- d last_received_cgen=$cgen
- d last_received=$f
+ d last_received_cgen=$last_received_cgen
+ d last_received=$last_received
# Get last_snap by date.
# when a btrbk bugfix makes it into the distro,
echo "$0: error: could not find latest snapshot for $svp among ${snaps[*]}" >&2
exit 1
fi
+ d last_snap=$last_snap
if [[ ! -e $svp ]]; then
echo "$0: warning: subvol does not exist: $svp"
stale=true
# fresh if $svp has $last_snap as a snapshot,
if btrfs sub show $svp 2>/dev/null | sed '0,/^\s*Snapshot(s):/d;s/^\s*//' | \
- grep -xF btrbk/$last_snap &>/dev/null; then
+ grep -xF ${last_snap#$root_dir/} ; then
stale=false
else # or else $svp is a snapshot of $last_snap. we use a uuid
# comparison, which if I remember from the docs, is a bit more
;;
esac
-
# disable motd junk.
case $distro in
debian)
# docker eats up a fair amount of cpu when doing nothing, so don't enable it unless
# we really need it.
pi-nostart docker-ce
+ # and docker is even more crap, it ignores that it shouldnt start
+ ser stop docker
+ ser disable docker
case $HOSTNAME in
li|lj) sgo docker ;;
esac
;;
esac
+pi ${p1[@]}
+
# website setup
case $HOSTNAME in
lj|li)
########### end section including li/lj ###############
-pi ${p4[@]} $(apt-cache search ruby[.0-9]+-doc| awk '{print $1}')
+# depends gcc is a way to install suggests. this is apparently the only
+# way to install suggests even if the main package is already
+# installed. reinstall doesn't work, uninstalling can cause removing
+# dependent packages.
+pi ${pall[@]} $(apt-cache search ruby[.0-9]+-doc| awk '{print $1}') $(apt-cache depends gcc|grep -i suggests:| awk '{print $2}')
+sgo fsf-vpn-dns-cleanup
case $distro in
trisquel|ubuntu)
case $distro in
debian|trisquel|ubuntu)
- # suggests because we want the resolvconf package. however, i install it earlier
- # as well, so this is redundant.
+ # suggests resolvconf package. installing it here is redundant, but make sure anyways.
# todo: check other distros to make sure it\'s installed
- pi-nostart --install-suggests openvpn
+ pi-nostart openvpn resolvconf
# pi-nostart does not disable
ser disable openvpn
;;
case $(debian-codename) in
# needed for debootstrap scripts for fai since fai requires debian
flidas)
+ curl http://archive.ubuntu.com/ubuntu/project/ubuntu-archive-keyring.gpg | s apt-key add -
s dd of=/etc/apt/preferences.d/flidas-xenial <<EOF
Package: *
Pin: release a=xenial
deb http://us.archive.ubuntu.com/ubuntu/ xenial-updates main
deb http://us.archive.ubuntu.com/ubuntu/ xenial-security main
EOF
- curl http://archive.ubuntu.com/ubuntu/project/ubuntu-archive-keyring.gpg | s apt-key add -
+ s apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32
s dd of=/etc/apt/preferences.d/flidas-bionic <<EOF
Package: *
Pin: release a=bionic
Pin-Priority: -100
EOF
- # this will be needed if we want to pin something,
- # but until then, better off disabled
-# s dd of=/etc/apt/sources.list.d/bionic.list 2>/dev/null <<EOF
-# deb http://us.archive.ubuntu.com/ubuntu/ bionic main
-# deb http://us.archive.ubuntu.com/ubuntu/ bionic-updates main
-# deb http://us.archive.ubuntu.com/ubuntu/ bionic-security main
-# EOF
+ # better to run btrfs-progs which matches our kernel version
+ # (note, renamed from btrfs-tools)
+ s dd of=/etc/apt/preferences.d/btrfs-progs <<EOF
+Package: btrfs-progs libzstd1
+Pin: release a=bionic
+Pin-Priority: 1005
+
+Package: *
+Pin: release a=bionic-updates
+Pin-Priority: 1005
+
+Package: *
+Pin: release a=bionic-security
+Pin-Priority: 1005
+EOF
+
+
+ # this will be needed if we want to pin something, generally useful for investigating
+ s dd of=/etc/apt/sources.list.d/bionic.list 2>/dev/null <<EOF
+deb http://us.archive.ubuntu.com/ubuntu/ bionic main
+deb http://us.archive.ubuntu.com/ubuntu/ bionic-updates main
+deb http://us.archive.ubuntu.com/ubuntu/ bionic-security main
+EOF
p update
+ pi btrfs-progs
+
t=$(mktemp -d)
cd $t
aptitude download debootstrap/xenial
--- /dev/null
+# If we reboot, or the vpn dies in an unusual way, it leaves dnsmasq config hanging around.
+# This cleans that up.
+[Unit]
+Description=fsf-vpn-dns-cleanup
+After=multi-user.target
+Conflicts=openvpn-client@fsf80.service openvpn@fsf80.service openvpn-client@fsf802.service openvpn-client@fsf803.service
+
+[Service]
+Type=oneshot
+ExecStart=/a/bin/distro-setup/fsf-vpn-dns-cleanup
--- /dev/null
+server=/fsf.org/gnu.org/192.168.0.10
+server=/fsf.org/gnu.org/192.168.0.25
+server=//192.168.0.10
+server=//192.168.0.25
+rev-server=192.168.0.0/24,192.168.0.10
+rev-server=192.168.0.0/24,192.168.0.25
+rev-server=172.16.0.0/23,192.168.0.10
+rev-server=172.16.0.0/23,192.168.0.25
--- /dev/null
+#!/bin/bash
+
+set -eE -o pipefail
+trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
+
+if ! echo | /a/exe/cedit fsf /etc/dnsmasq-servers.conf; then
+ if systemctl is-active dnsmasq >/dev/null; then
+ systemctl reload dnsmasq
+ fi
+fi
e() { echo "$*"; "$@"; }
# scripts that would interfere with unmounting /a, put them elsewhere
-e install btrbk-run mount-latest-subvol check-subvol-stale /usr/local/bin
+e install /a/bin/log-quiet/log-once btrbk-run mount-latest-subvol check-subvol-stale /usr/local/bin
if command -v apt-get &> /dev/null; then
debconf-set-selections <<EOF
postfix postfix/main_mailer_type select Satellite system
-postfix postfix/mailname string $HOSTNAME
+postfix postfix/mailname string $(hostname -f)
postfix postfix/relayhost string $relayhost
postfix postfix/root_address string $postmaster
EOF
# This name won\'t appear on From: lines of outgoing messages if rewriting is enabled.
# System mail name:
+# iank: see comment elsewhere on mailname
exim4-config exim4/mailname string mail.iankelling.org
# Delivery method for local mail: 2
exim4-config exim4/dc_localdelivery select Maildir format in home directory
EOF
+ echo mail.iankelling.org > /etc/mailname
+
# MAIN_HARDCODE_PRIMARY_HOSTNAME might mess up the
# smarthost config type, not sure. all other settings
# would be unused in that config type.
EOF
####### end dovecot setup ########
+ # https://selivan.github.io/2017/12/30/systemd-serice-always-restart.html
+ d=/etc/systemd/system/openvpn@mail
+ mkdir -p $d
+ cat >$d/override.conf <<'EOF'
+[Service]
+Restart=always
+# time to sleep before restarting a service
+RestartSec=1
+
+[Unit]
+# StartLimitIntervalSec in recent systemd versions
+StartLimitInterval=0
+EOF
systemctl enable offlineimapsync.timer
systemctl start offlineimapsync.timer
debconf-set-selections <<EOF
exim4-config exim4/dc_eximconfig_configtype select mail sent by smarthost; no local mail
exim4-config exim4/dc_smarthost string $smarthost
-# the default, i think is from /etc/mailname. better to set it to
-# whatever the current fqdn is.
+# afaik, on dpkg-reconfigure noninteractive, this sets /etc/mailname if it does not exist.
+# if it does exist, it immediately changes the value to whats in /etc/mailname.
+# So, I don't think there's any point in setting it, but might as well since
+# ignoring what I set here is brain dead and might change.
exim4-config exim4/mailname string $(hostname -f)
EOF
+ hostname -f > /etc/mailname
fi # end $HOSTNAME != $MAIL_HOST
# if latest is already mounted, make sure binds are mounted and move on
e check-subvol-stale $d
# populated by check-subvol-stale if stale
- if ! fresh_snap=$(</nocow/btrfs-stale/$vol); then
+ if ! fresh_snap=$(cat /nocow/btrfs-stale/$vol 2>/dev/null); then
mnt $d
for b in ${binds[@]}; do
mnt $b
set -eE -o pipefail
trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
-
# mail-route can get messed up a bit randomly, I don't know why.
#/b/ds/mail-route up | /b/log-quiet/log-once -1 mail-route
shopt -s nullglob
omv() { # offlineimap mv. move mail files within $src_base/$1 to /m/md/$2
- src="$1"
- dst="$2"
- found_files=false
- for x in new cur; do
- files=($src_base/"$src"/$x/*)
- if [[ $files ]]; then
- found_files=true
- mv "${files[@]}" /m/md/"$dst"/$x
- fi
- done
+ src="$1"
+ dst="$2"
+ found_files=false
+ for x in new cur; do
+ files=($src_base/"$src"/$x/*)
+ if [[ $files ]]; then
+ found_files=true
+ mv "${files[@]}" /m/md/"$dst"/$x
+ fi
+ done
}
src_base=/m/offlineimap
omv INBOX offlineimaptmp
src_base=/m/md
if $found_files; then
- sieve-filter -eW ~/sieve/main.sieve offlineimaptmp &>/dev/null
- # the default folder is INBOX for anything leftover
- omv offlineimaptmp INBOX
- # remove messages from remote host
- offlineimap -u quiet
- # this makes us sit and wait when we want to use mu and this is running in a cronjob.
- # todo: emacs updates the index much faster. what command is it running? I'd like
- # to just run that
- # looks like it might be mu index --lazy-check, but that still takes like 10 seconds,
- # figure out if that is the same speed, or if we can make it faster.
- #mu index &>/dev/null ||:
+ sieve-filter -eW ~/sieve/main.sieve offlineimaptmp &>/dev/null
+ # the default folder is INBOX for anything leftover
+ omv offlineimaptmp INBOX
+ # remove messages from remote host
+ offlineimap -u quiet
+ # this makes us sit and wait when we want to use mu and this is running in a cronjob.
+ # todo: emacs updates the index much faster. what command is it running? I'd like
+ # to just run that
+ # looks like it might be mu index --lazy-check, but that still takes like 10 seconds,
+ # figure out if that is the same speed, or if we can make it faster.
+ #mu index &>/dev/null ||:
fi
+# find but ignore directories which dont exist, assuming first args are directories
+# and a following arg starts with -
+myfind() {
+ dirs=()
+ for d; do
+ if [[ $d == -* ]]; then
+ # past dirs, onto options
+ break
+ fi
+ shift
+ if [[ -e $d ]]; then
+ dirs+=($d)
+ fi
+ done
+ if [[ $dirs ]]; then
+ find ${dirs[@]} $@
+ fi
+}
# qemu-devel is our biggest list by far, so occasionally
# I want to hop into conversations about our mailing
# systems there, but I don't need many old messages.
-find /nocow/user/fsfmd/l/qemu-devel/new -type f -mtime +14 -execdir rm -- '{}' +
+myfind /nocow/user/fsfmd/l/qemu-devel/new -type f -mtime +14 -execdir rm -- '{}' +
+
-find /nocow/user/fsfmd/{sec,Spam,Drafts,{rtcc,sysadmin,l/outreachy-mentors}/new} -type f -mtime +100 -execdir rm -- '{}' +
+myfind /nocow/user/fsfmd/{sec,Spam,Drafts,{rtcc,sysadmin,l/outreachy-mentors}/new} -type f -mtime +100 -execdir rm -- '{}' +
-find /nocow/user/fsfmd/log -type f -mtime +300 -execdir rm -- '{}' +
+myfind /nocow/user/fsfmd/log -type f -mtime +300 -execdir rm -- '{}' +
# delete based on http://deflexion.com/2006/05/imap-way-of-deleting-message
# packages with the same name across distros.
p1=(
- trash-cli
- cryptsetup
- lvm2
- mbuffer
- screen
+ trash-cli
+ cryptsetup
+ lvm2
+ mbuffer
+ screen
)
p2=(
- # 2nd
- ghc
- konsole
- xmonad
- cabal-install
- suckless-tools
+ # 2nd
+ ghc
+ konsole
+ xmonad
+ cabal-install
+ suckless-tools
)
p3=(
- at
- bash-completion
- curl
- ethtool
- eatmydata
- fping
- git
- htop
- iptables
- mailutils
- nmon
- ntp
- rdiff-backup
- ruby
- ruby-rest-client
- traceroute
- tree
- vim
- wcd
- wget
+ at
+ bash-completion
+ curl
+ ethtool
+ eatmydata
+ fping
+ git
+ htop
+ iptables
+ mailutils
+ nmon
+ ntp
+ rdiff-backup
+ ruby
+ ruby-rest-client
+ traceroute
+ tree
+ vim
+ wcd
+ wget
)
# swh-plugins is for karaoke pulsaudio filter.
# pv is used by btrbk
# libterm-readkey-perl for rt cli tool
# fonts pkgs are an attempt to get less block characters
+# gnat-5 & ccache is for coreboot
p4=(
- adb
- apache2
- apache2-doc
- apt-doc
- apt-listchanges
- apt-rdepends
- aptitude-doc-en
- asciidoc
- backupninja
- bash-doc
- beets
- beets-doc
- binutils-doc
- bind9-doc
- bind9utils
- bwm-ng
- cloc
- cpulimit
- cron
- debian-archive-keyring
- debootstrap
- debconf-doc
- dirmngr
- dnsutils
- dnsmasq
- dtrx
- duplicity
- eclipse
- elinks
- evince
- fdupes
- feh
- filelight
- flashrom
- fonts-noto
- fonts-roboto
- fonts-thai-tlwg
- fonts-thai-tlwg-otf
- xfonts-intl-asian
- fonts-sil-lateef
- gawk-doc
- gcc-doc
- gdb
- gdb-doc
- geoip-bin
- git-doc
- git-email
- git-svn
- gitk
- glibc-doc
- goaccess
- gnome-screenshot
- gnupg-doc
- guvcview
- i3lock
- inotify-tools
- iputils-tracepath
- iperf3
- iproute2-doc
- jq
- kid3-qt
- kid3-cli
- konsole
- libterm-readkey-perl
- libreoffice
- linphone
- linux-doc
- lshw
- make-doc
- manpages
- manpages-dev
- markdown
- mb2md
- meld
- moreutils
- mps-youtube
- mpv
- mumble
- nagstamon
- needrestart
- ncdu
- nginx-doc
- nmap
- offlineimap
- oathtool
- opendkim-tools
- p7zip
- paprefs
- parted-doc
- pass
- pavucontrol
- pdfgrep
- perl-doc
- pianobar
- pidgin
- pidgin-otr
- pip
- pry
- pv
- python-autopep8
- python3-doc
- qrencode
- readline-doc
- reportbug
- rng-tools
- sakura
- schroot
- sig2dot
- sipcalc
- sqlite3-doc
- squashfs-tools
- strace
- swh-plugins
- tar-doc
- tcpdump
- telnet
- transmission-remote-gtk
- vlc
- w3m
- whois
- wondershaper
- xawtv
- xbacklight
- xdot
- xloadimage
- xprintidle
- xscreensaver
- xscreensaver-data-extra
- xscreensaver-gl
- xscreensaver-gl-extra
+ adb
+ apache2
+ apache2-doc
+ apt-doc
+ apt-listchanges
+ apt-rdepends
+ aptitude-doc-en
+ asciidoc
+ backupninja
+ bash-doc
+ beets
+ beets-doc
+ binutils-doc
+ bind9-doc
+ bind9utils
+ bwm-ng
+ ccache
+ cloc
+ cpulimit
+ cron
+ debian-archive-keyring
+ debootstrap
+ debconf-doc
+ dirmngr
+ dnsutils
+ dnsmasq
+ dtrx
+ duplicity
+ eclipse
+ elinks
+ evince
+ fdupes
+ feh
+ filelight
+ flashrom
+ fonts-noto
+ fonts-roboto
+ fonts-thai-tlwg
+ fonts-thai-tlwg-otf
+ xfonts-intl-asian
+ fonts-sil-lateef
+ gawk-doc
+ gcc-doc
+ gdb
+ gdb-doc
+ geoip-bin
+ git-doc
+ git-email
+ git-svn
+ gitk
+ glibc-doc
+ goaccess
+ gnat-5
+ gnome-screenshot
+ gnupg-doc
+ guvcview
+ hunspell
+ i3lock
+ inotify-tools
+ iputils-tracepath
+ iperf3
+ iproute2-doc
+ jq
+ kid3-qt
+ kid3-cli
+ konsole
+ libterm-readkey-perl
+ libreoffice
+ linphone
+ linux-doc
+ lshw
+ make-doc
+ manpages
+ manpages-dev
+ markdown
+ mb2md
+ meld
+ moreutils
+ mps-youtube
+ mpv
+ mumble
+ nagstamon
+ ncdu
+ nginx-doc
+ nmap
+ offlineimap
+ oathtool
+ opendkim-tools
+ p7zip
+ paprefs
+ parted-doc
+ pass
+ pavucontrol
+ pdfgrep
+ perl-doc
+ pianobar
+ pidgin
+ pidgin-otr
+ pry
+ pv
+ python-autopep8
+ python-pip
+ python3-doc
+ qrencode
+ readline-doc
+ reportbug
+ rng-tools
+ sakura
+ schroot
+ sig2dot
+ sipcalc
+ sqlite3-doc
+ squashfs-tools
+ strace
+ swh-plugins
+ tar-doc
+ tcpdump
+ telnet
+ transmission-remote-gtk
+ vlc
+ w3m
+ whois
+ wondershaper
+ xawtv
+ xbacklight
+ xdot
+ xloadimage
+ xprintidle
+ xscreensaver
+ xscreensaver-data-extra
+ xscreensaver-gl
+ xscreensaver-gl-extra
)
pall=(${p1[@]} ${p2[@]} ${p3[@]} ${p4[@]} )
trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
usage() {
- cat <<EOF
+ cat <<EOF
Usage: ${0##*/} OLD_HOST NEW_HOST
Adjust home network dns so NEW_HOST resolves locally if it is on the
Note: Uses GNU getopt options parsing style
EOF
- exit $1
+ exit $1
}
##### begin command line parsing ########
temp=$(getopt -l help wh "$@") || usage 1
eval set -- "$temp"
while true; do
- case $1 in
- -w) update_wrt=false; shift ;;
- -h|--help) usage ;;
- --) shift; break ;;
- *) echo "$0: Internal error! unexpected args: $*" ; exit 1 ;;
- esac
+ case $1 in
+ -w) update_wrt=false; shift ;;
+ -h|--help) usage ;;
+ --) shift; break ;;
+ *) echo "$0: Internal error! unexpected args: $*" ; exit 1 ;;
+ esac
done
source /a/bin/bash_unpublished/source-semi-priv
if [[ $old_host != $MAIL_HOST ]]; then
- read -p "warning: \$old_host != \$MAIL_HOST: $old_host != $MAIL_HOST, proceed? y/N "
- if [[ $REPLY != [yY] ]]; then
- exit 1
- fi
+ read -p "warning: \$old_host != \$MAIL_HOST: $old_host != $MAIL_HOST, proceed? y/N "
+ if [[ $REPLY != [yY] ]]; then
+ exit 1
+ fi
fi
if [[ $new_host == "$HOSTNAME" ]]; then
- localhost_new=true
- new_shell=
+ localhost_new=true
+ new_shell=
else
- localhost_new=false
- new_shell="ssh $new_host"
+ localhost_new=false
+ new_shell="ssh $new_host"
fi
old_shell="ssh $old_host"
if [[ $old_host == "$HOSTNAME" ]]; then
- old_shell=
+ old_shell=
fi
if [[ ! $new_host || ! $old_host ]]; then
- echo "$0: bad args. see script"
- exit 1
+ echo "$0: bad args. see script"
+ exit 1
fi
at_home=false
if [[ $HOSTNAME == tp ]] || [[ $HOSTNAME == frodo ]] || timeout -s 9 5 ssh wrt.b8.nz :; then
- at_home=true
+ at_home=true
fi
echo "$0: at_home = $at_home"
# because our port forward is not robust enough, we can't use proxy command,
# todo: setup vpn so this is all taken care of.
if ! $update_wrt; then
- wrt_shell=:
+ wrt_shell=:
elif $at_home; then
- wrt_shell="ssh wrt.b8.nz"
+ wrt_shell="ssh wrt.b8.nz"
else
- if [[ $old_host == iank.vpn.office.fsf.org || $new_host == iank.vpn.office.fsf.org ]]; then
- wrt_shell="ssh iank.vpn.office.fsf.org ssh wrt.b8.nz"
- else
- wrt_shell="ssh $HOME_DOMAIN ssh wrt.b8.nz"
- fi
+ if [[ $old_host == iank.vpn.office.fsf.org || $new_host == iank.vpn.office.fsf.org ]]; then
+ wrt_shell="ssh iank.vpn.office.fsf.org ssh wrt.b8.nz"
+ else
+ wrt_shell="ssh $HOME_DOMAIN ssh wrt.b8.nz"
+ fi
fi
btrbk_test="systemctl is-active btrbk.service"
while $new_shell $btrbk_test || $old_shell $btrbk_test; do
- echo "$0: btrbk is running on new or old host. sleeping for 8 seconds"
- sleep 6
- echo "$0: testing for btrbk activity in 2 seconds"
- sleep 2
+ echo "$0: btrbk is running on new or old host. sleeping for 8 seconds"
+ sleep 6
+ echo "$0: testing for btrbk activity in 2 seconds"
+ sleep 2
done
new_hostname=$($new_shell hostname)
restore_new_btrbk=false
if $new_shell systemctl is-active btrbk.timer; then
- $new_shell sudo systemctl stop btrbk.timer
- restore_new_btrbk=true
+ $new_shell sudo systemctl stop btrbk.timer
+ restore_new_btrbk=true
fi
restore_old_btrbk=false
if $old_shell systemctl is-active btrbk.timer; then
- $old_shell sudo systemctl stop btrbk.timer
- restore_old_btrbk=true
+ $old_shell sudo systemctl stop btrbk.timer
+ restore_old_btrbk=true
fi
# if new_host is not on home network, make mail.iankelling.org not resolve
# on the home network.
if [[ $new_host == $HOSTNAME ]] && ! $at_home; then
- echo | $wrt_shell cedit mail_host /etc/hosts || [[ $? == 1 ]] # 1 means file changed.
+ echo | $wrt_shell cedit mail_host /etc/hosts || [[ $? == 1 ]] # 1 means file changed.
else
- $wrt_shell bash -xs $new_host <<'EOFOUTER'
+ $wrt_shell bash -xs $new_host <<'EOFOUTER'
new_host=$1
cedit mail_host /etc/hosts <<EOF || /etc/init.d/dnsmasq restart
$(grep "\b$new_hostname\b" /etc/hosts | awk '{print $1}') mail.iankelling.org
EOFOUTER
fi
-$old_shell /a/bin/distro-setup/install-my-scripts
$old_shell primary-setup $new_hostname
-sudo dd of=/etc/btrbk.conf <<'EOF'
-ssh_identity /root/.ssh/home
-# Just a guess that local7 is a good facility to pick.
-# It's a bit odd that the transaction log has to be logged to
-# a file or syslog, while other output is sent to std out.
-# The man does not mention a way for them to be together, but
-# I dunno if setting a log level like warn might also output
-# transaction info.
-transaction_syslog local7
-
-# so we only run one at a time
-lockfile /var/lock/btrbk.lock
-
-# default format of short does not accomidate hourly preservation setting
-timestamp_format long-iso
-
-# only make a snapshot if things have changed
-snapshot_create onchange
-# I could make this different from target_preserve,
-# if one disk had less space.
-# for now, keeping them equal.
-snapshot_preserve 36h 14d 8w 24m
-snapshot_preserve_min 4h
-snapshot_dir btrbk
-
-# so, total backups = ~89
-target_preserve 36h 14d 8w 24m
-target_preserve_min 4h
-
-# if something fails and it's not obvious, try doing
-# btrbk -l debug -v dryrun
-
-
-EOF
-
+/a/bin/distro-setup/install-my-scripts
if $localhost_new; then
- btrbk_src=ssh://$old_host/mnt/root
- btrbk_dst=/mnt/root/btrbk
+ btrbk-run -s $old_host -m /o
else
- btrbk_src=/mnt/root
- btrbk_dst=ssh://$new_host/mnt/root/btrbk
+ btrbk-run -t $new_host -m /o
fi
-sudo tee -a /etc/btrbk.conf <<EOF
-volume $btrbk_src
-subvolume o
-target send-receive $btrbk_dst
-EOF
-
-
-sudo btrbk -l debug --progress run
-$new_shell /a/bin/distro-setup/install-my-scripts
-$new_shell mount-latest-subvol
$new_shell primary-setup $new_hostname
if $restore_new_btrbk; then
- $new_shell sudo systemctl start btrbk.timer
+ $new_shell sudo systemctl start btrbk.timer
fi
if $restore_old_btrbk; then
- $old_shell sudo systemctl start btrbk.timer
+ $old_shell sudo systemctl start btrbk.timer
fi
iankelling.org / git / distro-setup / commitdiff