########### begin section including li ################
+conflink
case $distro in
arch)
-if [[ $HOSTNAME == treetowl ]]; then
- # vpn-server setup via:
+### begin home vpn server setup
- vpn-server-setup -r -d
- s tee -a /etc/openvpn/server/server.conf <<'EOF'
+
+# # this section done initially to make persistent keys.
+# # Also note, I temporarily set /etc/hosts so my host was
+# # b8.nz when running this, since the vpn client config
+# # generator assumes we need to go to that server to get
+# # server keys.
+# vpn-server-setup -rds
+# s cp -r --parents /etc/openvpn/easy-rsa/keys /p/c/filesystem
+# s chown -R 1000:1000 /p/c/filesystem/etc/openvpn/easy-rsa/keys
+# for host in x2 kw; do
+# vpn-mk-client-cert -b $host -n home b8.nz
+# dir=/p/c/machine_specific/$host/filesystem/etc/openvpn/client
+# mkdir -p $dir
+# s bash -c "cp /etc/openvpn/client/home* $dir"
+# # note: /etc/update-resolv-conf-home also exists for all systems with /p
+# done
+
+
+vpn-server-setup -rds
+s tee -a /etc/openvpn/server/server.conf <<'EOF'
push "dhcp-option DNS 192.168.1.1"
push "route 192.168.1.0 255.255.255.0"
client-connect /a/bin/distro-setup/vpn-client-connect
EOF
- s sed -i --follow-symlinks 's/10.8./10.9./g' /etc/openvpn/server/server.conf
- ser restart openvpn-server@server
- vpn-mk-client-cert -s /etc/update-resolv-conf-home -c x2 -n home b8.nz
- dir=/p/c/machine_specific/x2/filesystem/etc/openvpn/client
- mkdir -p $dir
- # background: We have these files locally, but we\'d have to duplicate the logic
- # in vpn-mk-client-cert to get them, and this is just simpler.
- scp root@x2:/etc/openvpn/client/home* $dir
-
+s sed -i --follow-symlinks 's/10.8./10.9./g' /etc/openvpn/server/server.conf
+
+if [[ $HOSTNAME == tp ]]; then
+ if [[ -e /lib/systemd/system/openvpn-server@.service ]]; then
+ vpn_service=openvpn-server@.service
+ else
+ vpn_service=openvpn@server
+ fi
+ sgo $vpn_service
+fi
+### end vpn server setup
+if [[ $HOSTNAME == tp ]]; then
# note, see bashrc for more documentation.
pi rss2email
fi
######### begin pump.io periodic backup #############
-if [[ $HOSTNAME == treetowl ]]; then
+if [[ $HOSTNAME == tp ]]; then
s dd of=/etc/systemd/system/pumpbackup.service <<'EOF'
[Unit]
Description=pump li backup
spa lib32stdc++6 default-jdk
-if [[ $HOSTNAME == treetowl ]]; then
+if [[ $HOSTNAME == frodo ]]; then
############# begin syncthing setup ###########
# It\'s simpler to just worry about running it in one place for now.
# it contains runtime data,
# plus a simple symlink to the config file which it\'s
# not worth separating out.
- s lnf -T /i/transmission-daemon /var/lib/transmission-daemon/.config/transmission-daemon
# between comps, the uid can change
- s chown -R debian-transmission:debian-transmission /i/transmission-daemon /var/lib/transmission-daemon
- s chown -R debian-transmission:traci /i/k/partial-torrents /i/k/torrents
+ f=/i/transmission-daemon
+ s lnf -T $f /var/lib/transmission-daemon/.config/transmission-daemon
+ if [[ -e $f ]]; then
+ s chown -R debian-transmission:debian-transmission $f
+ fi
+ for f in /i/k/partial-torrents /i/k/torrents; do
+ if [[ -e $f ]]; then
+ s chown -R debian-transmission:traci $f
+ fi
+ done
+ s chown -R debian-transmission:debian-transmission /var/lib/transmission-daemon
#
# config file documented here, and it\'s the same config
# for daemon vs client, so it\'s documented in the gui.
debian) pi adb ;;
debian|trisquel|ubuntu) spa android-tools-adbd ;;
# todo: not sure this is needed anymore, or if trisqel etc works even
-# debian) spa android-tools-adbd/unstable ;;
+ # debian) spa android-tools-adbd/unstable ;;
arch) spa android-tools ;;
# other distros unknown
esac
-if [[ $HOSTNAME == treetowl ]]; then
- :
- ## bitcoin disabled. fees too high
- # case $distro in
- # debian)
- # if [[ `debian-archive` == testing ]]; then
- # # has no unstable dependencies
- # pi bitcoind/unstable
- # src=/a/opt/bitcoin/contrib/init/bitcoind.service
- # s cp $src /etc/systemd/system
- # p=/etc/bitcoin/bitcoin
- # dst=/etc/systemd/system/bitcoinjm.service
- # # jm for joinmarket
- # $sed -r "/^\s*ExecStart/s,${p}.conf,${p}jm.conf," $src \
- # >/etc/systemd/system/bitcoinjm.service
-
- # d=jm; jm=d # being clever for succinctness
- # for s in d jm; do
- # s $sed -ri "/^\s*\[Unit\]/a Conflicts=bitcoin${!s}.service" \
- # /etc/systemd/system/bitcoin${s}.service
- # done
-
- # ser daemon-reload
-
- # dir=/nocow/.bitcoin
- # s mkdir -p $dir
- # s chown -R bitcoin:bitcoin $dir
- # dir=/etc/bitcoin
- # s mkdir -p $dir
- # s chown -R root:bitcoin $dir
- # s chmod 750 $dir
-
- # # pruning decreases the bitcoin dir to 2 gb, keeps
- # # just the recent blocks. can\'t do a few things like
- # # import a wallet dump.
- # # pruning works, but people had to do
- # # some manual stuff in joinmarket. I dun need the
- # # disk space, so not bothering yet, maybe in a year or so.
- # # https://github.com/JoinMarket-Org/joinmarket/issues/431
- # #https://bitcoin.org/en/release/v0.12.0#wallet-pruning
- # #prune=550
-
- # f=$dir/bitcoin.conf
- # s dd of=$f <<EOF
- # server=1
- # # necessary for joinmarket, not bad in general
- # rpcpassword=$(openssl rand -base64 32)
- # rpcuser=$(openssl rand -base64 32)
- # EOF
-
- # # dunno about sharing a wallet between multiple instances
- # # manually did, wallet.dat symlinked in /nocow/.bitcoin
- # sgo bitcoind
- # fi
- # ;;
- # # other distros unknown
- # esac
-
-
-
- # ## disabling joinmarket, its too expensive
- # ### begin joinmarket setup ###
-
- # case $distro in
- # debian)
- # f=$dir/bitcoin.conf
- # f2=$dir/bitcoinjm.conf
- # s cp $f $f2
- # s tee -a $f2 >/dev/null <<EOF
- # # Joinmarket
- # walletnotify=curl -sI --connect-timeout 1 http://localhost:62602/walletnotify?%s
- # alertnotify=curl -sI --connect-timeout 1 http://localhost:62602/alertnotify?%s
- # wallet=joinmarket.dat
- # EOF
-
- # ;;
- # # other distros unknown
- # esac
-
- # pi libsodium-dev python-pip
- # cd /a/opt/joinmarket
- # # using develop branch, as it seems to be mostly bug fixes,
- # # and this is quite new software.
- # # note: python3 does not work.
- # # has seg fault error due to some bug, but it still works
- # pip install -r requirements.txt || [[ $? == 139 ]]
- # # note, the target must exist ahead of time, or bitcoin
- # # just overwrites the link, and it\'s not happy with an empty file,
- # # so we have to create the wallet, then move and link it.
- # s lnf -T /q/bitcoin/wallet.dat /nocow/.bitcoin/wallet.dat
- # s lnf -T /q/bitcoin/joinmarket.dat /nocow/.bitcoin/joinmarket.dat
- # # not technically needed, but seems cleaner not to have
- # # symlinks be root owned unlike everything else
- # s chown -h bitcoin:bitcoin /nocow/.bitcoin/*
-
- # for var in rpcuser rpcpassword; do
- # u="$(s sed -rn "s/^$var=(.*)/\1/p" /etc/bitcoin/bitcoin.conf)"
- # # escape backslashes
- # u="${u//\\/\\\\\\\\}"
- # # escape commas
- # u="${u//,/\\,}"
- # sed -ri "s,^(rpc_${var#rpc}\s*=).*,\1 $u," joinmarket.cfg
- # done
- # sed -ri "s/^\s*(blockchain_source\s*=).*/\1 bitcoin-rpc/" joinmarket.cfg
- # ### end joinmarket setup ###
-
-
-fi
case $distro in
# EOF
# s systemctl daemon-reload
# case $HOSTNAME in
-# x2|treetowl)
+# x2|tp)
# ser enable synergyc@iank
# ser start synergyc@iank ||: # X might not be running yet
# ;;
# compilers.
spa unison unison-gtk
;;
- arch)
- spa unison gtk2
- ;;
+arch)
+ spa unison gtk2
+ ;;
esac
case $distro in
cd /a/opt/btrbk
s make install
spa pv # for progress bar when running interactively.
-if [[ $HOSTNAME == treetowl ]]; then
- # backup/sync manually on others hosts for now.
- sgo btrbk.timer
- # note: to see when it was last run,
- # ser list-timers
-fi
+
+# ian: temporarily disabled while hosts are in flux.
+# if [[ $HOSTNAME == tp ]]; then
+# # backup/sync manually on others hosts for now.
+# sgo btrbk.timer
+# # note: to see when it was last run,
+# # ser list-timers
+# fi
else
echo "$0: $(date): ending now)"
fi
+exit 0
iankelling.org / git / distro-setup / blobdiff