apache2
bwm-ng
chromium
+ cron
debconf-doc
duplicity
eclipse
evince
fdupes
+ feh
filelight
gcc-doc
gdb
# no equivalent in other distros:
case $distro in
debian|ubuntu)
- pi apt-file aptitude
- s apt-file update
+ pi aptitude
+ if ! dpkg -s apt-file &>/dev/null; then
+ # this condition is just a speed optimization
+ pi apt-file
+ s apt-file update
+ fi
# for debconf-get-selections
spa debconf-utils
;;
ser enable vpnmail.service
acme-tiny-wrapper mail.iankelling.org
sgo openvpn
+ tu /etc/hosts <<<"mail.iankelling.org 10.8.0.4"
echo "$0: $(date): ending now)"
########### end section including li/lj ###############
+case $distro in
+ debian|ubuntu)
+ # suggests because we want the resolvconf package.
+ # todo: check other distros to make sure it's installed
+ pi-nostart --install-suggests openvpn
+ # pi-nostart does not disable
+ ser disable openvpn
+ ;;
+ *) pi openvpn;;
+esac
+
if private-host; then
vpn-mk-client-cert -n mail li
- echo "ifconfig-push 10.8.0.4 255.255.255.0" | ssh root@li dd of=/etc/openvpn/client-config/$(openssl x509 -noout -subject -in mail.crt | sed -r 's/.*CN *= *([^,]+).*/\1/')
+ cn=$(s openssl x509 -noout -nameopt multiline -subject \
+ -in /etc/openvpn/client/mail.crt | \
+ sed -rn 's/^\s*commonName\s*=\s*(.*)/\1/p')
+ echo "ifconfig-push 10.8.0.4 255.255.255.0" | \
+ ssh root@li dd of=/etc/openvpn/client-config/"$cn"
fi
ser enable mailroute
if [[ $HOSTNAME == treetowl ]]; then
spa lib32stdc++6 default-jdk
-case $distro in
- arch) pi syncthing ;;
- ubuntu|debian)
- # testing has relatively up to date packages
- if ! isdebian-testing; then
- # based on error when doing apt-get update:
- # E: The method driver /usr/lib/apt/methods/https could not be found.
- pi apt-transport-https
- # google led me here:
- # https://apt.syncthing.net/
- curl -s https://syncthing.net/release-key.txt | sudo apt-key add -
- s="deb http://apt.syncthing.net/ syncthing release"
- if [[ $(cat /etc/apt/sources.list.d/syncthing.list) != $s ]]; then
- echo "$s" | s dd of=/etc/apt/sources.list.d/syncthing.list
- p update
+if [[ $HOSTNAME == treetowl ]]; then
+ # It\'s simpler to just worry about running it in one place for now.
+ # I assume it would work to clone it\'s config to another non-phone
+ # and just run it in one place instead of the normal having a
+ # separate config. I lean toward using the same config, since btrfs
+ # syncs between comps.
+ case $distro in
+ arch) pi syncthing ;;
+ ubuntu|debian)
+ # testing has relatively up to date packages
+ if ! isdebian-testing; then
+ # based on error when doing apt-get update:
+ # E: The method driver /usr/lib/apt/methods/https could not be found.
+ pi apt-transport-https
+ # google led me here:
+ # https://apt.syncthing.net/
+ curl -s https://syncthing.net/release-key.txt | sudo apt-key add -
+ s="deb http://apt.syncthing.net/ syncthing release"
+ if [[ $(cat /etc/apt/sources.list.d/syncthing.list) != $s ]]; then
+ echo "$s" | s dd of=/etc/apt/sources.list.d/syncthing.list
+ p update
+ fi
fi
- fi
- pi syncthing
- ;;
-esac
-# installed via f-droid
-# top right, actions, device id
-#
-# for installing on a remote comp:
-# ssh -L 8384:localhost:8384 -N frodo
-# went to http://localhost:8384/
-#
-# add folder to sync phone,
-# staggered file versioning would be my normal choice, but choose
-# trash can versioning for sake of space on phone, with
-# clean out after 7 days.
-#
-# did:
-# ser start syncthing@ian
-# then on phone, add device, hit bar code icon,
-# install bar code scanner.
+ pi syncthing
+ ;;
+ esac
+ sgo syncthing@ian # runs as ian
+
+ # these things persist in ~/.config/syncthing, which I save in
+ # /p/c/machine_specific
+ # open http://localhost:8384/
+ # change listen address from default to tcp://:22001,
+ # this is because we do port forward so it doesn\'t have to use
+ # some external server, but the syncthing is broken for port forward,
+ # you get a message, something "like connected to myself, this should not happen"
+ # when connecting to other local devices, so I bump the port up by 1,
+ # based on
+ # https://forum.syncthing.net/t/connected-to-myself-should-not-happen/1763/19.
+ # Without this, it was being stuck syncing at 0%.
+ # Set gui username and password.
+ #
+ # install syncthing via f-droid,
+ # folder setting, turn off master folder (makes it read only).
+ # on phone, add device, click bar code icon
+ # on dekstop, top right, actions, device id
+ # after adding, notification will appear on desktop to confirm
+ #
+ # add folder to sync phone, notification will appear on desktop
+ # to set folder location.
+ #
+ # On phone, set settings to run syncthing all the time, and
+ # show no notification.
+ #
+ # Folder versioning would make sense if I didn\'t already use btrfs
+ # for backups. I would choose staggered, or trash can for more space.
+ #
+ # if needed to install on a remote comp:
+ # ssh -L 8384:localhost:8384 -N frodo
+ # open http://localhost:8384/
+ #
+ # Note, the other thing i did was port forward port 22000,
+ # per https://docs.syncthing.net/users/firewall.html
+fi
+
# no equivalent in other distros:
# some reason it doesn't seem to start automatically anyways
pi-nostart transmission-daemon
+
+ # the folder was moved here after an install around 02/2017.
+ # it contains runtime data,
+ # plus a simple symlink to the config file which it's
+ # not worth separating out.
+ s lnf -T /q/transmission-daemon /var/lib/transmission-daemon/.config/transmission-daemon
#
# config file documented here, and it's the same config
# for daemon vs client, so it's documented in the gui.
# routing to a network namespace, it doesn't see the
# real source address, so it's disabled.
#
- # Changed the cache-size to 128 mb, reduces disk use.
+ # Changed the cache-size to 256 mb, reduces disk use.
# It is a read & write cache.
#
- # todo: setup a password.
s ruby <<'EOF'
require 'json'
p = '/etc/transmission-daemon/settings.json'
File.write(p, JSON.pretty_generate(JSON.parse(File.read(p)).merge({
'rpc-whitelist-enabled' => false,
'rpc-authentication-required' => false,
-'incomplete-dir' => '/k/partial-torrents',
+'incomplete-dir' => '/i/k/partial-torrents',
'incomplete-dir-enabled' => true,
'download-dir' => '/i/k/torrents',
"speed-limit-up" => 800,
"speed-limit-up-enabled" => true,
"peer-port" => 61486,
-"cache-size-mb" => 128,
-"ratio-limit" => 1.4000,
-"ratio-limit-enabled" => false,
-"pidfile": "/var/lib/transmission-daemon/transmission-daemon.pid",
+"cache-size-mb" => 256,
+"ratio-limit" => 5.0,
+"ratio-limit-enabled" => true,
})) + "\n")
EOF
ser disable transmission-daemon
sgo transmission-daemon-nn
;;
- # todo: others unknown
- esac
+ # todo: others unknown
+esac
fi
# adapted from /var/lib/dpkg/info/transmission-daemon.postinst
# only settings I set were
# hostname
# auto-connect
+# password
+
+
+# the password is randomly generated on first run
+rpc_pass=$(s ruby <<'EOF'
+require 'json'
+p = '/etc/transmission-daemon/settings.json'
+puts JSON.parse(File.read(p))["rpc-password"]
+EOF
+)
+
for f in /home/*; do
d=$f/.config/transmission-remote-gtk
u=${f##*/}
s -u $u mkdir -p $d
- s -u $u dd of=$d/config.json <<'EOF'
+ s -u $u dd of=$d/config.json <<EOF
{
"profiles" : [
{
"profile-name" : "Default",
- "hostname" : "treetowl",
+ "hostname" : "transmission",
"rpc-url-path" : "/transmission/rpc",
"username" : "",
- "password" : "",
+ "password" : "$rpc_pass",
"auto-connect" : true,
"ssl" : false,
"timeout" : 40,
EOF
done
-case $distro in
- debian|ubuntu)
- # suggests because we want the resolvconf package.
- # todo: check other distros to make sure it's installed
- pi-nostart --install-suggests openvpn
- # pi-nostart this doesnt seem to be good enough?
- ser disable openvpn@client
- ser disable openvpn
- ;;
- *) pi openvpn;;
-esac
-
pi wget
case $HOSTNAME in
tp|frodo)
0) : ;;
*)
# previously I had a more specific search, but dpkg
- # changed it's output as of 7/2016
+ # changed it\'s output as of 7/2016
if grep 'dependency problems' \
$log &>/dev/null; then
s apt-get -fy install
exit 1
fi
;;
-esac
-;;
-arch)
- pi google-chrome
- ;;
-esac
-;;
+ esac
+ ;;
+ arch)
+ pi google-chrome
+ ;;
+ esac
+ ;;
esac
# printer
case $distro in
debian)
- if [[ `debian-archive` == testing ]]; then
- # has no unstable dependencies
- spa bitcoin-qt/unstable
- fi
+ # if [[ `debian-archive` == testing ]]; then
+ # # has no unstable dependencies
+ # pi bitcoind/unstable
+ # fi
s cp /a/opt/bitcoin/contrib/init/bitcoind.service /etc/systemd/system
ser daemon-reload
s mkdir -p $dir
s chown -R root:bitcoin $dir
s chmod 750 $dir
- f=$dir/bitcon.conf
+ f=$dir/bitcoin.conf
# pruning decreases the bitcoin dir to 2 gb, keeps
# just the recent blocks. can't do a few things like
# other distros unknown
esac
if [[ $HOSTNAME == treetowl ]]; then
- pi libsodium-dev python3-pip
+ 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.
- pip install -r requirements.txt
+ # has seg fault error due to some bug, but it still works
+ pip install -r requirements.txt || [[ $? == 139 ]]
# we need bitcoin.conf in the data dir according to
# https://github.com/JoinMarket-Org/joinmarket/wiki/Running-JoinMarket-with-Bitcoin-Core-full-node
# following the example .service script, I don\'t have it there,
# dunno about sharing a wallet between multiple instances
# manually did, wallet.dat symlinked in /nocow/.bitcoin
- sgo bitcoind
+ #sgo bitcoind
fi
########### misc stuff
+devs=()
+for dev in $(s btrfs fi show /boot | sed -nr 's#.*path\s+(\S+)$#\1#p'); do
+ devs+=($(devbyid $dev),)
+done
+devs[-1]=${devs[-1]%,} # jonied by commas
+
+# on grub upgrade, we get prompts unless we do this
+s debconf-set-selections <<EOF
+grub-pc grub-pc/install_devices multiselect ${devs[*]}
+EOF
+
# the wiki backup script from ofswiki.org uses generic paths
s lnf /p/c/machine_specific/li/mw_vars /root
EOF
-if [[ $HOSTNAME == treetowl ]] && ! sudo test -e /etc/openvpn/client.key; then
- /a/bin/vpn-setup/vpn-mk-client-cert dopub
- # route lan traffic from inside the network namespace.
- tu /etc/openvpn/client.conf "route 192.168.1.0 255.255.255.0 net_gateway"
-fi
-
-
case $distro in
debian|ubuntu)
case `debian-archive` in
s dd of=/etc/apt/preferences.d/unison-gtk <<'EOF'
Explanation: Allow unison-gtk to be upgraded
Package: unison-gtk
-Pin: release a=unstable
+Pin: release a=testing
Pin-Priority: 500
EOF
# dont think using testing is needed since I figured out how to
iankelling.org / git / distro-setup / blobdiff