X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;ds=inline;f=distro-end;h=dde7a1026206449daf0f6affa9828b9424e3e84d;hb=69c1f384f54bba59a693c4ac9d61d8f7f3692269;hp=95a6e2ddd94de0c1b31b8b2cd0dd0538e0868e03;hpb=e87b740855adc5dc38ca375401068f5eaaab3fe9;p=distro-setup
diff --git a/distro-end b/distro-end
index 95a6e2d..dde7a10 100755
--- a/distro-end
+++ b/distro-end
@@ -35,6 +35,7 @@ spa() { # simple package add
distro=$(distro-name)
pending_reboot=false
+sed="sed --follow-symlinks"
# template
case $distro in
@@ -62,23 +63,37 @@ case $HOSTNAME in
# mutagen for pithos
simple_packages+=(
apache2
+ apache2-doc
+ apt-doc
+ aptitude-doc-en
+ bash-doc
+ binutils-doc
bwm-ng
chromium
+ cpio-doc
+ cron
debconf-doc
duplicity
eclipse
evince
fdupes
+ feh
filelight
+ gawk-doc
gcc-doc
gdb
+ gdb-doc
+ git-doc
gitk
+ glibc-doc
goaccess
gnome-screenshot
i3lock
+ iproute2-doc
jq
linux-doc
locate
+ make-doc
manpages
manpages-dev
meld
@@ -87,23 +102,29 @@ case $HOSTNAME in
offlineimap
p7zip
paprefs
+ parted-doc
pavucontrol
pdfgrep
+ perl-doc
pianobar
pidgin
+ python3-doc
python3-mutagen
reportbug
+ sqlite3-doc
squashfs-tools
swh-plugins
+ tar-doc
tcpdump
transmission-remote-gtk
vlc
+ whois
)
+ spa $(apt-cache search ruby[.0-9]+-doc| awk '{print $1}')
;;
esac
-
########### begin section including li ################
@@ -177,8 +198,12 @@ esac
# 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
;;
@@ -251,7 +276,7 @@ case $HOSTNAME in
#$src/phab-setup
pi-nostart mumble-server
- s sed -ri "s/^ *(serverpassword=).*/\1$(< /a/bin/bash_unpublished/mumble_pass)/" /etc/mumble-server.ini
+ s $sed -ri "s/^ *(serverpassword=).*/\1$(< /a/bin/bash_unpublished/mumble_pass)/" /etc/mumble-server.ini
sgo mumble-server
vpn-server-setup -d
@@ -263,8 +288,8 @@ Description=Turns on iptables mail nat
[Service]
Type=oneshot
RemainAfterExit=yes
-ExecStart=/sbin/iptables -t nat -A PREROUTING -i eth0 -p tcp -m tcp --dport 25 -j DNAT --to-destination 10.8.0.4:25
-ExecStop=/sbin/iptables -t nat -D PREROUTING -i eth0 -p tcp -m tcp --dport 25 -j DNAT --to-destination 10.8.0.4:25
+ExecStart=/a/bin/distro-setup/vpn-mail-forward start
+ExecStop=/a/bin/distro-setup/vpn-mail-forward stop
[Install]
WantedBy=openvpn.service
@@ -273,7 +298,25 @@ EOF
ser enable vpnmail.service
acme-tiny-wrapper mail.iankelling.org
sgo openvpn
- tu /etc/hosts <<<"mail.iankelling.org 10.8.0.4"
+ tu /etc/hosts <<<"10.8.0.4 mail.iankelling.org"
+ domain=cal.iankelling.org
+ acme-tiny-wrapper $domain
+ apache-site -f 10.8.0.4:5232 - $domain <<'EOF'
+#https://httpd.apache.org/docs/2.4/mod/mod_authn_core.html#authtype
+
+ Options +FollowSymLinks +Multiviews +Indexes
+ AllowOverride None
+ AuthType basic
+ AuthName "Authentication Required"
+ # setup one time, with root:www-data, 640
+ AuthUserFile "/etc/caldav-htpasswd"
+ Require valid-user
+
+EOF
+ # nginx version of above would be:
+ # auth_basic "Not currently available";
+ # auth_basic_user_file /etc/nginx/caldav/htpasswd;
+
echo "$0: $(date): ending now)"
@@ -284,14 +327,30 @@ esac
########### 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
- # note, this will need to be changed when the mail host changes
+ # note, this will need to be changed when the mail/contacts host changes
sgo openvpn-client@mail
+ /a/bin/distro-setup/radicale-setup
fi
## android studio setup
@@ -306,42 +365,77 @@ lnf /a/opt/.AndroidStudio2.2 ~
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
+ lnf -T /w/syncthing /home/ian/.config/syncthing
+ sgo syncthing@ian # runs as ian
+
+ # these things persist in ~/.config/syncthing, which I save in
+ # /w/syncthing (not in /p, because syncthing should continue to
+ # run on home server even when using laptop as primary device)
+ # 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
+ #
+ # syncing folder. from phone to desktop: select desktop in the
+ # folder on phone's sync options, notification will appear in
+ # desktop's web ui within a minute. For the reverse, the
+ # notification will appear in android's notifications, you have to
+ # swipe down and tap it to add the folder. It won't appear in the
+ # syncthing ui, which would be intuitive, but don't wait for it
+ # there.
+ #
+ # 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:
@@ -373,6 +467,12 @@ EOF
# 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 /i/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.
@@ -382,26 +482,24 @@ EOF
# 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
@@ -450,19 +548,30 @@ esac
# 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 </dev/null; then
s apt-get -fy install
@@ -522,13 +619,13 @@ case $HOSTNAME in
exit 1
fi
;;
-esac
-;;
-arch)
- pi google-chrome
- ;;
-esac
-;;
+ esac
+ ;;
+ arch)
+ pi google-chrome
+ ;;
+ esac
+ ;;
esac
# printer
@@ -664,7 +761,7 @@ case $distro in
bridge-utils dnsmasq qemu bind-tools
# otherwise we get error about accessing kvm module.
# seems like there might be a better way, but google was a bit vague.
- s sed -ri --follow-symlinks '/^ *user *=/d' /etc/libvirt/qemu.conf
+ s $sed -ri '/^ *user *=/d' /etc/libvirt/qemu.conf
echo 'user = "root"' | s tee -a /etc/libvirt/qemu.conf
# https://bbs.archlinux.org/viewtopic.php?id=206206
# # this should prolly go in the wiki
@@ -703,82 +800,84 @@ case $distro in
# other distros unknown
esac
-case $distro in
- debian)
- if [[ `debian-archive` == testing ]]; then
- # has no unstable dependencies
- spa bitcoin-qt/unstable
- fi
- s cp /a/opt/bitcoin/contrib/init/bitcoind.service /etc/systemd/system
- 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
- f=$dir/bitcon.conf
-
- # 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
-
- s dd of=$f </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 </dev/null </dev/null; then
# run "control userpasswords2", turn on automatic login.
# note: when changing devices, I just undefine, the create the vm again.
- if [[ -e /a/images/win10.qcow2 ]]; then
+ if [[ -e /nocow/user/vms/win10.qcow2 ]]; then
s virt-install --noautoconsole --graphics spice,listen=0.0.0.0 \
--disk=/a/images/win10.qcow2,bus=virtio --vcpus 2 -r 4096 -w bridge=br0 \
-n win10 --import --os-variant $variant --cpu host-model-only
@@ -1223,7 +1323,7 @@ if ! s virsh list --all --name | grep -xF win10 &>/dev/null; then
s virsh destroy win10
fi
- if [[ -e /a/images/win7.qcow2 ]]; then
+ if [[ -e /nocow/user/vms/win7.qcow2 ]]; then
# this one hasn\'t had the virtio fix done yet.
s virt-install --noautoconsole --graphics spice,listen=0.0.0.0 \
--disk=/a/images/win7.qcow2 --vcpus 2 -r 4096 -w bridge=br0 \