From 9e67b088b46c5c7f101679f791b60dc259f24bb1 Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Fri, 10 Feb 2017 20:33:28 -0800 Subject: [PATCH] various fixes after reinstalling treetowl --- check-subvol-stale | 0 distro-begin | 2 +- distro-end | 114 ++++++++++++++++++++++++++++---------------- g | 22 --------- g2 | 4 -- mail-cert-cron | 0 mount-latest-subvol | 0 7 files changed, 74 insertions(+), 68 deletions(-) mode change 100644 => 100755 check-subvol-stale delete mode 100755 g delete mode 100644 g2 mode change 100644 => 100755 mail-cert-cron mode change 100644 => 100755 mount-latest-subvol diff --git a/check-subvol-stale b/check-subvol-stale old mode 100644 new mode 100755 diff --git a/distro-begin b/distro-begin index d2b6e08..a762284 100755 --- a/distro-begin +++ b/distro-begin @@ -590,7 +590,7 @@ if has_btrfs || home_network; then [[ $EUID == 0 ]] || exec sudo -E "$BASH_SOURCE" "$@" set -eE -o pipefail trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR -for dir in /i /mnt/iroot /k /kr; do +for dir in /i /mnt/iroot /k /kr /w; do if ! mountpoint $dir &>/dev/null && \ awk '{print $2}' /etc/fstab | grep -xF $dir &>/dev/null; then if awk '{print $3}' /etc/fstab | grep -xF nfs &>/dev/null; then diff --git a/distro-end b/distro-end index 920de7f..645f1d5 100755 --- a/distro-end +++ b/distro-end @@ -64,11 +64,13 @@ case $HOSTNAME in apache2 bwm-ng chromium + cron debconf-doc duplicity eclipse evince fdupes + feh filelight gcc-doc gdb @@ -177,8 +179,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 ;; @@ -284,9 +290,24 @@ 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 @@ -356,6 +377,9 @@ if [[ $HOSTNAME == treetowl ]]; then # 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. # @@ -398,6 +422,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 /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. @@ -407,26 +437,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 @@ -475,19 +503,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 <