X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=distro-end;h=d63d315d3da01c6a275bd2d68dda08ee0fed1e8b;hb=165008e5b82c81ebff1061c8f8294c3bc6e9dced;hp=52199b8216d2167f6ee6acd6aa9aa4ff93dadfa1;hpb=6f1f8a104c9b38936ade2d27e835479523985133;p=distro-setup
diff --git a/distro-end b/distro-end
index 52199b8..d63d315 100755
--- a/distro-end
+++ b/distro-end
@@ -1,26 +1,24 @@
-#!/bin/bash -l
-# Copyright (C) 2016 Ian Kelling
-
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-
-# http://www.apache.org/licenses/LICENSE-2.0
-
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+#!/bin/bash
+# Copyright (C) 2019 Ian Kelling
+# SPDX-License-Identifier: AGPL-3.0-or-later
+if [[ -s ~/.bashrc ]];then . ~/.bashrc;fi
### setup
source /a/bin/errhandle/err
src="$(readlink -f -- "${BASH_SOURCE[0]}")"; src=${src%/*} # directory of this file
+if [[ $EUID == 0 ]]; then
+ echo "$0: error: run as regular user" >&2
+ exit 1
+fi
+
+errcatch-cleanup() {
+ echo 1 >~/.local/distro-end
+}
+
# shellcheck source=./pkgs
source $src/pkgs
-set -x
exec &> >(sudo tee -a /var/log/distro-end)
echo "$0: $(date): starting now)"
# see example of usage to understand.
@@ -29,20 +27,36 @@ end_msg() {
IFS= read -r -d '' y ||:
end_msg_var+="$y"
}
-die() {
- printf "$0: %s\n" "$*" >&2; exit 1
+end() {
+ e "$end_msg_var"
+ echo 0 >~/.local/distro-end
+ if $pending_reboot; then
+ echo "$0: pending reboot and then finished. doing it now."
+ sudo reboot now
+ else
+ echo "$0: $(date): ending now)"
+ fi
+ exit 0
}
-spa() { # simple package add
- simple_packages+=($@)
+pre="${0##*/}:"
+sudo() {
+ printf "$pre %s\n" "$*"
+ SUDOD="$PWD" command sudo "$@";
}
+sd() {
+ sudo dd of="$1" 2>/dev/null
+}
+m() { printf "$pre %s\n" "$*"; "$@"; }
+e() { printf "$pre %s\n" "$*"; }
+err() { echo "[$(date +'%Y-%m-%d %H:%M:%S%z')]: $0: $*" >&2; }
distro=$(distro-name)
codename=$(debian-codename)
codename_compat=$(debian-codename-compat)
pending_reboot=false
sed="sed --follow-symlinks"
-# template
-case $distro in
-esac
+## template:
+# case $distro in
+# esac
#### initial packages
pup
@@ -51,32 +65,21 @@ if isdeb; then
fi
# avoid prompts
-s debconf-set-selections <
- 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;
-
-
-
- ###### begin znc setup #####
- pi znc
-
- # https://wiki.znc.in/FAQ seems to imply that znc doesn\'t need restart after cert change.
- # to get into the web interface,
- # then use non-main browser or else it doebsn't allow it based on ocsp stapling from my main site.
- # https://iankelling.org:12533/
- sudo -i <<'EOF'
-export RENEWED_LINEAGE=/etc/letsencrypt/live/iankelling.org
-/a/bin/distro-setup/certbot-renew-hook
-EOF
-
- # znc config generated by doing
- # znc --makeconf
- # selected port is also used in erc config
- # comma separated channel list worked.
- # while figuring things out, running znc -D for debug in foreground.
- # to exit and save config:
- # /msg *status shutdown
- # configed auth on freenode by following
- # https://wiki.znc.in/Sasl:
- # /msg *sasl RequireAuth yes
- # /msg *sasl Mechanism PLAIN
- # /msg *sasl Set ident_name password
- # created the system service after, and had to do
- # mv /home/iank/.znc/* /var/lib/znc
- # sed -i 's,/home/iank/.znc/,/var/lib/znc,' /var/lib/znc/config/znc.conf
- # and made a copy of the config files into /p/c
- # /msg *status LoadMod --type=global log -sanitize
- # todo: in config file AllowWeb = true should be false. better security if that is off unless we need it.
- # /msg *status LoadMod --type=network perform
- # /msg *perform add PRIVMSG ChanServ :invite #fsf-office
- # /msg *perform add JOIN #fsf-office
- #
- # i set Buffer = 500
- # also ran /znc LoadMod clearbufferonmsg
- # it would be nice if erc supported erc query buffers by doing
- # /msg *status clearbuffer /dev/null <<'EOF'
-[Unit]
-Description=ZNC, an advanced IRC bouncer
-After=network-online.target
-
-[Service]
-ExecStart=/usr/bin/znc -f --datadir=/var/lib/znc
-User=znc
-
-[Install]
-WantedBy=multi-user.target
-EOF
- ser daemon-reload
- sgo znc
- ###### stop znc setup #####
-
- ######### begin flidas pinned packages ######
- 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 </dev/null </dev/null </dev/null; then
+ sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32
+ sd /etc/apt/preferences.d/flidas-bionic <$t <$t <$t <$t <$t <$t <
+ 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;
+
+
+
+ ###### begin znc setup #####
+ pi znc
+
+ # https://wiki.znc.in/FAQ seems to imply that znc doesn\'t need restart after cert change.
+ # to get into the web interface,
+ # then use non-main browser or else it doebsn't allow it based on ocsp stapling from my main site.
+ # https://iankelling.org:12533/
+ s <<'EOF'
+export RENEWED_LINEAGE=/etc/letsencrypt/live/iankelling.org
+/a/bin/distro-setup/certbot-renew-hook
+EOF
+
+ # znc config generated by doing
+ # znc --makeconf
+ # selected port is also used in erc config
+ # comma separated channel list worked.
+ # while figuring things out, running znc -D for debug in foreground.
+ # to exit and save config:
+ # /msg *status shutdown
+ # configed auth on freenode by following
+ # https://wiki.znc.in/Sasl:
+ # /msg *sasl RequireAuth yes
+ # /msg *sasl Mechanism PLAIN
+ # /msg *sasl Set ident_name password
+ # created the system service after, and had to do
+ # mv /home/iank/.znc/* /var/lib/znc
+ # sed -i 's,/home/iank/.znc/,/var/lib/znc,' /var/lib/znc/config/znc.conf
+ # and made a copy of the config files into /p/c
+ # /msg *status LoadMod --type=global log -sanitize
+ # todo: in config file AllowWeb = true should be false. better security if that is off unless we need it.
+ # /msg *status LoadMod --type=network perform
+ # /msg *perform add PRIVMSG ChanServ :invite #fsf-office
+ # /msg *perform add JOIN #fsf-office
+ #
+ # i set Buffer = 500
+ # also ran /znc LoadMod clearbufferonmsg
+ # it would be nice if erc supported erc query buffers by doing
+ # /msg *status clearbuffer /dev/null; then
+ sudo useradd --create-home -d /var/lib/znc --system --shell /sbin/nologin --comment "Account to run ZNC daemon" --user-group znc
+ fi
+ sudo chmod 700 /var/lib/znc
+ sudo chown -R znc:znc /var/lib/znc
+ # Avoid restarting if possible, reconnecting to irc is annoying.
+ # The unit file was made active with conflink.
+ # Note, avoid using ser here because we wrap sudo to prints the command first.
+ if [[ $(systemctl is-active znc) != active ]]; then
+ sgo znc
+ fi
+ ###### stop znc setup #####
+
+ end
;;
esac
+###### end website setup
########### end section including li/lj ###############
@@ -588,17 +616,12 @@ esac
# dependent packages.
pi ${pall[@]} $(apt-cache search ruby[.0-9]+-doc| awk '{print $1}') $(apt-cache depends gcc|grep -i suggests:| awk '{print $2}') $($src/distro-pkgs)
-if ! type pip; then
- x=$(mktemp)
- wget -O$x https://bootstrap.pypa.io/get-pip.py
- python3 $x --user
-fi
sgo fsf-vpn-dns-cleanup
-# website is dead june 14 2019
-s rm -f /etc/apt/sources.list.d/iridium-browser.list
+# website is dead june 14 2019. back in october, but meh
+sudo rm -fv /etc/apt/sources.list.d/iridium-browser.list
# case $distro in
# debian)
# pi chromium ;;
@@ -641,13 +664,13 @@ s rm -f /etc/apt/sources.list.d/iridium-browser.list
# done
# key already exists, so this won't generate one, just the configs.
-vpn-server-setup -rds
-s tee -a /etc/openvpn/server/server.conf <<'EOF'
+m vpn-server-setup -rds
+sudo tee -a /etc/openvpn/server/server.conf <<'EOF'
push "dhcp-option DNS 10.0.0.1"
push "route 10.0.0.0 255.255.0.0"
client-connect /a/bin/distro-setup/vpn-client-connect
EOF
-s sed -i --follow-symlinks 's/10.8./10.9./g;s/^\s*port\s.*/port 1196/' /etc/openvpn/server/server.conf
+sudo sed -i --follow-symlinks 's/10.8./10.9./g;s/^\s*port\s.*/port 1196/' /etc/openvpn/server/server.conf
if [[ $HOSTNAME == tp ]]; then
if [[ -e /lib/systemd/system/openvpn-server@.service ]]; then
@@ -663,7 +686,7 @@ fi
##### rss2email
# note, see bashrc for more documentation.
pi rss2email
-s dd of=/etc/systemd/system/rss2email.service <<'EOF'
+sd /etc/systemd/system/rss2email.service <<'EOF'
[Unit]
Description=rss2email
After=multi-user.target
@@ -676,7 +699,7 @@ Type=oneshot
# we pass options to use different location.
ExecStart=/a/bin/log-quiet/sysd-mail-once -288 rss2email r2e -d /p/c/rss2email.json -c /p/c/rss2email.cfg run
EOF
-s dd of=/etc/systemd/system/rss2email.timer <<'EOF'
+sd /etc/systemd/system/rss2email.timer <<'EOF'
[Unit]
Description=rss2email
@@ -689,12 +712,12 @@ OnUnitInactiveSec=300
[Install]
WantedBy=timers.target
EOF
-s systemctl daemon-reload
+sudo systemctl daemon-reload
######### begin pump.io periodic backup #############
if [[ $HOSTNAME == frodo ]]; then
- s dd of=/etc/systemd/system/pumpbackup.service <<'EOF'
+ sd /etc/systemd/system/pumpbackup.service <<'EOF'
[Unit]
Description=pump li backup
After=multi-user.target
@@ -704,7 +727,7 @@ User=iank
Type=oneshot
ExecStart=/a/bin/log-quiet/sysd-mail-once pump-backup /a/bin/distro-setup/pump-backup
EOF
- s dd of=/etc/systemd/system/pumpbackup.timer <<'EOF'
+ sd /etc/systemd/system/pumpbackup.timer <<'EOF'
[Unit]
Description=pump li backup hourly
@@ -714,7 +737,7 @@ OnCalendar=hourly
[Install]
WantedBy=timers.target
EOF
- s systemctl daemon-reload
+ ser daemon-reload
sgo pumpbackup.timer
fi
######### end pump.io periodic backup #############
@@ -722,7 +745,7 @@ fi
######### begin irc periodic backup #############
if [[ $HOSTNAME == frodo ]]; then
- s dd of=/etc/systemd/system/ircbackup.service <<'EOF'
+ sd /etc/systemd/system/ircbackup.service <<'EOF'
[Unit]
Description=irc li backup
After=multi-user.target
@@ -732,7 +755,7 @@ User=iank
Type=oneshot
ExecStart=/a/bin/log-quiet/sysd-mail-once irc-backup rsync -rlptDhSAX root@iankelling.org:/var/lib/znc/moddata/log/iank/freenode/ /k/irclogs
EOF
- s dd of=/etc/systemd/system/ircbackup.timer <<'EOF'
+ sd /etc/systemd/system/ircbackup.timer <<'EOF'
[Unit]
Description=irc li backup hourly
@@ -742,7 +765,7 @@ OnCalendar=hourly
[Install]
WantedBy=timers.target
EOF
- s systemctl daemon-reload
+ sudo systemctl daemon-reload
sgo ircbackup.timer
fi
@@ -750,10 +773,6 @@ fi
######### end irc periodic backup #############
-# https://github.com/jlebon/textern
-cd /a/opt/textern
-make native-install USER=1
-
case $distro in
debian|trisquel|ubuntu)
# suggests resolvconf package. installing it here is redundant, but make sure anyways.
@@ -765,18 +784,7 @@ case $distro in
*) pi openvpn;;
esac
-/a/bin/distro-setup/radicale-setup
-
-## android studio setup
-# this contains the setting for android sdk to point to
-# /a/opt/androidsdk, which is asked upon first run
-lnf /a/opt/.AndroidStudio2.2 ~
-# android site says it needs a bunch of packages for ubuntu,
-# but I googled for debian, and someone says you just need lib32stdc++6 plus the
-# jdk
-# https://pid7007blog.blogspot.com/2015/07/installing-android-studio-in-debian-8.html
-# see w.org for more android studio details
-spa lib32stdc++6 default-jdk
+m /a/bin/distro-setup/radicale-setup
############# begin syncthing setup ###########
@@ -786,27 +794,22 @@ if [[ $HOSTNAME == frodo ]]; then
# 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 ;;
- trisquel|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
- pi syncthing
- ;;
- esac
- lnf -T /w/syncthing /home/iank/.config/syncthing
+ # 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" | sd /etc/apt/sources.list.d/syncthing.list
+ p update
+ fi
+ fi
+ pi syncthing
+ m lnf -T /w/syncthing /home/iank/.config/syncthing
ser daemon-reload # syncthing likely not properly packaged
sgo syncthing@iank # runs as iank
@@ -867,11 +870,11 @@ esac
# sakura config is owned by ian
-reset-sakura
-reset-konsole
-sudo -u user2 -i reset-konsole
+m reset-sakura
+m reset-konsole
+m sudo -u user2 -i reset-konsole
# user2 xscreensaver we don't want to reset
-reset-xscreensaver
+m reset-xscreensaver
# this would install from cabal for newer / consistent version across os, but it screws up xmonad, so disabled for now.
@@ -882,40 +885,31 @@ reset-xscreensaver
# also, i assume syncing this between machines somehow messed thin
#lnf -T /m/arbtt-capture.log ~/.arbtt/capture.log
-primary-setup
+m primary-setup
if [[ ! -e ~/.linphonerc && -e /p/.linphonerc-initial ]]; then
- cp /p/.linphonerc-initial ~/.linphonerc
+ m cp /p/.linphonerc-initial ~/.linphonerc
fi
### begin spd install
pi libswitch-perl libdigest-md5-file-perl libgnupg-interface-perl
t=$(mktemp)
-wget -O $t http://mirror.fsf.org/fsfsys-trisquel/fsfsys-trisquel/pool/main/s/spd-perl/spd-perl_0.2-1_amd64.deb
-s dpkg -i $t
-rm $t
+m wget -O $t http://mirror.fsf.org/fsfsys-trisquel/fsfsys-trisquel/pool/main/s/spd-perl/spd-perl_0.2-1_amd64.deb
+sudo dpkg -i $t
+m rm $t
# this guesses at the appropriate directory, adjust if needed
perldir=(/usr/lib/x86_64-linux-gnu/perl/5.*)
-sudo ln -sf ../../../perl/5.18.2/SPD/ ${perldir[0]}
+m sudo ln -sf ../../../perl/5.18.2/SPD/ ${perldir[0]}
# newer distro had gpg2 as default, older one, flidas, need to make it that way
gpgpath=$(which gpg2)
if [[ $x ]]; then
- s mkdir -p /usr/local/spdhackfix
+ sudo mkdir -p /usr/local/spdhackfix
s lnf -T $gpgpath /usr/local/spdhackfix/gpg
fi
### end spd install
-if [[ $HOSTNAME == kw ]]; then
- cat <<'EOF'
-NOTE: after this finishes, i did
-s nmtui-connect
-# remove br from auto:
-s vim /etc/network/interfaces
-EOF
-fi
-
# nagstamon setting which were set through the ui
# in filters tab:
# all unknown sources
@@ -945,15 +939,10 @@ fi
# but i'm just going to rely on the webpage plus sms for now.
-case $distro in
- debian|trisquel|ubuntu)
- # it asks if it should make users in it's group capture packets without root,
- # which is arguably more secure than running wireshark as root. default is no,
- # which is what i prefer, since I plan to use tcpdump to input to wireshark.
- s DEBIAN_FRONTEND=noninteractive pi wireshark-gtk
- ;;
- # others unknown
-esac
+# it asks if it should make users in it's group capture packets without root,
+# which is arguably more secure than running wireshark as root. default is no,
+# which is what i prefer, since I plan to use tcpdump to input to wireshark.
+s DEBIAN_FRONTEND=noninteractive pi wireshark-gtk
# /run and /dev/shm are listed as required for pulseaudio. All 4 in the group
# listed in the default config as suggested.
@@ -988,7 +977,7 @@ mkschroot() {
fi
apps=($@)
d=/nocow/schroot/$n
- s dd of=/etc/schroot/chroot.d/$n.conf < /dev/null; then
- s groupadd -g 450 debian-transmission
- case $distro in
- arch)
- s useradd \
- --system \
- --create-home \
- --gid 450 \
- --uid 450 \
- --home-dir /var/lib/transmission-daemon \
- --shell /bin/false \
- debian-transmission
- ;;
- *)
- s adduser --quiet \
- --gid 450 \
- --uid 450 \
- --system \
- --no-create-home \
- --disabled-password \
- --home /var/lib/transmission-daemon \
- debian-transmission
- ;;
- esac
+ sudo groupadd -g 450 debian-transmission
+ sudo adduser --quiet \
+ --gid 450 \
+ --uid 450 \
+ --system \
+ --no-create-home \
+ --disabled-password \
+ --home /var/lib/transmission-daemon \
+ debian-transmission
fi
# We want group writable stuff from transmission.
# However, after setting this, I learn that transmission sets it's
# own umask based on it's settings file. Well, no harm leaving this
# so it's set right from the beginning.
-s chfn debian-transmission -o umask=0002
+sudo chfn debian-transmission -o umask=0002
-case $distro in
- debian|trisquel|ubuntu)
- # note i had to do this, which is persistent:
- # cd /i/k
- # s chgrp debian-transmission torrents partial-torrents
-
- # syslog says things like
- # 'Failed to set receive buffer: requested 4194304, got 425984'
- # google suggets giving it even more than that
- tu /etc/sysctl.conf<<'EOF'
+# note i had to do this, which is persistent:
+# cd /i/k
+# s chgrp debian-transmission torrents partial-torrents
+
+# syslog says things like
+# 'Failed to set receive buffer: requested 4194304, got 425984'
+# google suggets giving it even more than that
+tu /etc/sysctl.conf<<'EOF'
net.core.rmem_max = 67108864
net.core.wmem_max = 16777216
EOF
- s sysctl -p
-
- # some reason it doesn\'t seem to start automatically anyways
- pi-nostart transmission-daemon
- # be extra sure its not started
- ser disable transmission-daemon
- ser stop 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.
- # between comps, the uid can change
- 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:user2 $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.
- # https://trac.transmissionbt.com/wiki/EditConfigFiles#Options
- #
- # I originaly setup rpc-whitelist, but after using
- # routing to a network namespace, it doesn\'t see the
- # real source address, so it\'s disabled.
- #
- # Changed the cache-size to 256 mb, reduces disk use.
- # It is a read & write cache.
- #
- s ruby <<'EOF'
+sudo sysctl -p
+
+# some reason it doesn\'t seem to start automatically anyways
+pi-nostart transmission-daemon
+# be extra sure its not started
+ser disable transmission-daemon
+ser stop 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.
+# between comps, the uid can change
+f=$tdir/transmission-daemon
+mkdir -p $f
+s lnf -T $f /var/lib/transmission-daemon/.config/transmission-daemon
+s lnf -T /etc/transmission-daemon/settings.json $f/settings.json
+sudo chown -R debian-transmission:debian-transmission $f
+for f in $tdir/partial-torrents $tdir/torrents; do
+ if [[ -e $f ]]; then
+ sudo chown -R debian-transmission:user2 $f
+ fi
+done
+sudo 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.
+# https://trac.transmissionbt.com/wiki/EditConfigFiles#Options
+#
+# I originaly setup rpc-whitelist, but after using
+# routing to a network namespace, it doesn\'t see the
+# real source address, so it\'s disabled.
+#
+# Changed the cache-size to 256 mb, reduces disk use.
+# It is a read & write cache.
+sudo ruby < false,
'rpc-authentication-required' => false,
-'incomplete-dir' => '/i/k/partial-torrents',
+'incomplete-dir' => '$tdir/partial-torrents',
'incomplete-dir-enabled' => true,
-'download-dir' => '/i/k/torrents',
+'download-dir' => '$tdir/torrents',
"speed-limit-up" => 800,
"speed-limit-up-enabled" => true,
"peer-port" => 61486,
@@ -1148,10 +1131,7 @@ File.write(p, JSON.pretty_generate(JSON.parse(File.read(p)).merge({
"ratio-limit-enabled" => true,
})) + "\n")
EOF
-
- ;;
- # todo: others unknown
-esac
+####### end transmission
@@ -1161,7 +1141,7 @@ if [[ ! -e /lib/systemd/system/openvpn-client@.service ]]; then
vpn_ser=openvpn
fi
-s dd of=/etc/systemd/system/transmission-daemon-nn.service </dev/null) || continue
+ if [[ ! $uid -ge 1000 ]]; then
continue
fi
d=$f/.config/transmission-remote-gtk
- s -u $u mkdir -p $d
- s -u $u dd of=$d/config.json </dev/null; then
- cd $(mktemp -d)
- # just the latest stable at the time of writing
- # TODO, maybe put this all into a build script,
- # and do some automatic updates
- wget -q https://dl.google.com/go/go1.12.4.linux-amd64.tar.gz
- s tar -C /usr/local -xzf go1.12.4.linux-amd64.tar.gz
- rm -f ./*
- fi
- go get -u mvdan.cc/fdroidcl
- # a bit of googling, and added settings to bashrc
- ;;
-esac
-
-case $distro in
- arch)
- pi virt-install
- # 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 '/^ *user *=/d' /etc/libvirt/qemu.conf
- echo 'user = "root"' | s tee -a /etc/libvirt/qemu.conf
- # guessing this is not needed
- #sgo virtlogd.service
-
- # iank: disabed as im not using libvirt usually
- # # https://bbs.archlinux.org/viewtopic.php?id=206206
- # # # this should prolly go in the wiki
- # sgo virtlogd.socket
- # sgo libvirtd
- ;;
- debian|trisquel|ubuntu)
- pi-nostart virtinst virt-manager
- ;;
-
-esac
-
-
-case $distro in
- fedora)
- cd $(mktemp -d)
- wget ftp://ftp.gnu.org/pub/gnu/global/global-6.5.7.tar.gz
- ex global*
- cd global-6.5.7
- # based on https://github.com/leoliu/ggtags
- ./configure --with-exuberant-ctags=/usr/bin/ctags
- make
- s make install
- pip install pygments
- ;;
- *)
- pi global
- ;;&
- arch)
- pi python2-pygments
- ;;
- debian|trisquel|ubuntu)
- pi python-pygments
- ;;
-esac
-
+m /a/bin/buildscripts/go
+m /a/bin/buildscripts/rust
+m /a/bin/buildscripts/misc
+pi-nostart virtinst virt-manager
-# removed synergy since ive not used it in a long time
pi --no-install-recommends kdeconnect
@@ -1386,16 +1309,11 @@ pi --no-install-recommends kdeconnect
# set arduino var in bashrc,
# have system config file setup too.
sudo adduser $USER dialout
-case $distro in
- arch)
- sudo usermod -a -G uucp $USER
- ;;
-esac
# this is for the mail command too. update-alternatives is kind of misleading
# since at least it's main commands pretend mail does not exist.
# bsd's mail got pulled in on some dumb dependency, i dunno how.
-s update-alternatives --set mailx /usr/bin/mail.mailutils
+sudo update-alternatives --set mailx /usr/bin/mail.mailutils
######### end misc packages #########
@@ -1420,7 +1338,7 @@ pi smartmontools
# -o on, turn on 4 hour period non-performance degrading testing.
# short test daily 2-3am, extended tests Saturdays between 3-4am:
sched="-s (S/../.././02|L/../../6/03)"
-s sed -i --follow-symlinks "s#^[[:space:]]*DEVICESCAN.*#\
+sudo sed -i --follow-symlinks "s#^[[:space:]]*DEVICESCAN.*#\
DEVICESCAN -a -o on -S on -n standby,q $sched \
-m ian@iankelling.org -M exec /usr/local/bin/smart-notify#" /etc/smartd.conf
@@ -1444,7 +1362,8 @@ DEVICESCAN -a -o on -S on -n standby,q $sched \
# conflicts with the normal dnsmasq package.
f=/etc/NetworkManager/NetworkManager.conf
m=$(md5sum $f)
-s sed -ri '/ *\[main\]/,/^ *\[[^]]+\]/{/^\s*dns[[:space:]=]/d}' $f
+sudo sed -ri '/ *\[main\]/,/^ *\[[^]]+\]/{/^\s*dns[[:space:]=]/d}' $f
+sudo sed -ri '/ *\[main\]/a dns=default' $f
if [[ $m != $(md5sum $f) ]]; then
srestart NetworkManager
fi
@@ -1452,9 +1371,9 @@ fi
# make my /etc/fonts/conf.d/ get used.
# I have a new sans-serif font there because the default one
# displays l and I as the same char, grrrrr.
-s fc-cache
+sudo fc-cache
-/a/bin/distro-setup/mymimes
+m /a/bin/distro-setup/mymimes
sgo dynamicipupdate
@@ -1464,7 +1383,7 @@ sgo dynamicipupdate
# dbus-launch makes this work within an ssh connection, otherwise you get this message,
# with still 0 exit code.
# dconf-WARNING **: failed to commit changes to dconf: Cannot autolaunch D-Bus without X11 $DISPLAY
-dbus-launch gsettings set org.gnome.desktop.media-handling automount-open false
+m dbus-launch gsettings set org.gnome.desktop.media-handling automount-open false
# on grub upgrade, we get prompts unless we do this
@@ -1473,7 +1392,7 @@ for dev in $(s btrfs fil show /boot | sed -nr 's#.*path\s+(\S+)$#\1#p'); do
devs+=("$(devbyid $dev),")
done
devs[-1]=${devs[-1]%,} # jonied by commas
-s debconf-set-selections </dev/null; then
- cd $(mktemp -d)
- wget https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh
- # added some stuff to envonment.sh for profile based on
- # manual instructions
- # wget https://sv.gnu.org/people/viewgpg.php?user_id=15145 -qO - | gpg --import -
- # echo is to get past prompt
- yes | sudo -E HOME=$HOME bash guix-install.sh || [[ $? == 141 ]]
- guix install glibc-utf8-locales
- guix package --install guile
-fi
-# install rust.
-curl https://sh.rustup.rs -sSf | bash -s -- -y
-# todo: update this. updates in rust are stupidly complicate
-if ! which rg &>/dev/null; then
- cargo install ripgrep
-fi
-
-#### tor
-case $distro in
- # based on
- # https://www.torproject.org/docs/rpms.html.en
- # https://www.torproject.org/docs/debian.html.en
- # todo: figure out if the running service needs to be restarted upon updates
- # todo on fedora: setup non-dev packages
- fedora)
- s dd of=/etc/yum.repos.d/torproject.repo <<'EOF'
-[tor]
-name=Tor experimental repo
-enabled=1
-baseurl=http://deb.torproject.org/torproject.org/rpm/tor-testing/fc/20/$basearch/
-gpgcheck=1
-gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.asc
-
-[tor-source]
-name=Tor experimental source repo
-enabled=1
-autorefresh=0
-baseurl=http://deb.torproject.org/torproject.org/rpm/tor-testing/fc/20/SRPMS
-gpgcheck=1
-gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.asc
-EOF
+# # Based on guix manual instructions, also added code to profile.
+# # disabled since i'm not using it now.
+# pi nscd
+# if ! type -p guix >/dev/null; then
+# cd $(mktemp -d)
+# wget https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh
+# # added some stuff to envonment.sh for profile based on
+# # manual instructions
+# # wget https://sv.gnu.org/people/viewgpg.php?user_id=15145 -qO - | gpg --import -
+# # echo is to get past prompt
+# yes | sudo -E HOME=$HOME bash guix-install.sh || [[ $? == 141 ]]
+# guix install glibc-utf8-locales
+# guix package --install guile
+# fi
- # to be secure, take a look at the fingerprint reported from the following install, and see if it matches from the link above:
- # 3B9E EEB9 7B1E 827B CF0A 0D96 8AF5 653C 5AC0 01F1
- sgo tor
- /a/bin/buildscripts/tor-browser
- ;;
- ubuntu)
- tu /etc/apt/sources.list "deb http://deb.torproject.org/torproject.org $(debian-codename) main"
- gpg --keyserver keys.gnupg.net --recv 886DDD89
- gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -
- p update
- pi deb.torproject.org-keyring
- pi tor
- /a/bin/buildscripts/tor-browser
- ;;
- debian)
- pi tor
- /a/bin/buildscripts/tor-browser
- ;;
- arch)
- pi tor tor-browser-en
- sgo tor
- ;;
- # ubuntu unknown
-esac
-# nfs server
-case $distro in
- fedora)
- end_msg <<'EOF'
-fedora todo: disable the firewall or find a way to automate it.
-there's an unused section in t.org for tramikssion firewall setup
-
-fedora manual config for nfs:
-s firewall-config
-change to permanent configuration
-check the box for nfs
-was hard to figure this out, not sure if this is all needed, but
-unblock these too
-mountd: udp/tcp 20048
-portmapper, in firewall-config its called rpc-bind: udp/tcp 111
-troubleshooting, unblock things in rpcinfo -p
-make sure to reload the firewall to load the persistent configuration
+pi tor
+m /a/bin/buildscripts/tor-browser
-EOF
- pi nfs-utils
- ;;
- debian|trisquel|ubuntu)
- pi-nostart nfs-server
- ;;
- arch)
- pi nfs-utils || pending_reboot=true
- ;;
-esac
+# nfs server
+pi-nostart nfs-kernel-server
# networkmanager has this nasty behavior on flidas: if the machine
# crashes with dnsmasq running, on subsequent boot, it adds an entry to
@@ -1651,7 +1452,6 @@ esac
# then based on whats in /run/dnsmasq/, i see we can run
# s resolvconf -d NetworkManager
# oh ya, and stoping NetworkManager leaves this crap behind without cleaning it up.
-ser stop NetworkManager
ser disable NetworkManager
@@ -1664,11 +1464,10 @@ if [[ $HOSTNAME == frodo ]]; then
tu /etc/exports <<'EOF'
/k 10.0.0.0/24(rw,fsid=0,nohide,no_root_squash,async,no_subtree_check,insecure)
EOF
- s exportfs -rav
+ sudo exportfs -rav
fi
-e "$end_msg_var"
@@ -1682,11 +1481,4 @@ e "$end_msg_var"
######### begin stuff belonging at the end ##########
-
-if $pending_reboot; then
- echo "$0: pending reboot and then finished. doing it now."
- s reboot now
-else
- echo "$0: $(date): ending now)"
-fi
-exit 0
+end