X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=distro-end;h=6c0f446642d15916512a929ce22caad4ef9a71f2;hb=f5bedaabc8ab8e0fa29238b70ab66bd7d37095d1;hp=1288c7580202f20381526526772f5d2000623c00;hpb=48fdb1ea98aff5633ec228332f54534872c50f98;p=distro-setup diff --git a/distro-end b/distro-end index 1288c75..6c0f446 100755 --- a/distro-end +++ b/distro-end @@ -1,288 +1,1419 @@ #!/bin/bash -l -# Copyright (C) 2016 Ian Kelling -# This program is under GPL v. 3 or later, see -set -eE -o pipefail -trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR +# Copyright (C) 2019 Ian Kelling +# SPDX-License-Identifier: AGPL-3.0-or-later -set -x - -distro=$(distro-name) +### 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 -is_debian_testing() { - grep -E '^[^#]debian.*\stesting\s+main\s*$' /etc/apt/sources.list &>/dev/null +_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. +end_msg() { + local y + IFS= read -r -d '' y ||: + end_msg_var+="$y" +} +die() { + printf "$0: %s\n" "$*" >&2; exit 1 +} +spa() { # simple package add + simple_packages+=($@) +} +distro=$(distro-name) +codename=$(debian-codename) +codename_compat=$(debian-codename-compat) +pending_reboot=false +sed="sed --follow-symlinks" # template case $distro in esac +#### initial packages pup +if isdeb; then + pi aptitude +fi -# universal packages -x=( - bwm-ng - chromium - duplicity - fail2ban - fdupes - gdb - gnome-screenshot - meld - mpv - offlineimap - openvpn - p7zip - paprefs - pavucontrol - pianobar - pidgin - rdiff-backup - slock - smartmontools - squashfs-tools - tree -) - -pi "${x[@]}" - -# things with no equivalent in other distros: -case $distro in - debian|ubuntu) - # for gui bug reporting - pi python-vte - pi apt-file aptitude - s apt-file update - # for debconf-get-selections - pi debconf-utils - ;; -esac +# avoid prompts +s debconf-set-selections < +# AllowOverride None +# AuthType basic +# AuthName "Authentication Required" +# # setup one time, with root:www-data, 640 +# AuthUserFile "/etc/prometheus-htpasswd" +# Require valid-user +# +# EOF +# fi + + +######### 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 <$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/ + 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 ##### + + + + echo "$0: $(date): ending now)" + exit 0 + ;; esac -case $distro in - arch) pi nfs-utils ;; - ubuntu|debian) pi nfs-client ;; +###### end website setup + +########### end section including li/lj ############### + +#### desktop stuff +case $codename_compat in + xenial) + # mate-indicator-applet and beyond are msc things I noticed diffing a + # standard install with mine. + pi xorg lightdm mate-desktop-environment mate-desktop-environment-extras mate-indicator-applet anacron + ;; + stretch) + pi task-mate-desktop + ;; + buster) + # mate doesnt have wayland support yet + pi task-gnome-desktop + ;; esac + + + + +# TODO: some of the X programs can be removed from pall when using wayland + +# depends gcc is a way to install suggests. this is apparently the only +# way to install suggests even if the main package is already +# installed. reinstall doesn't work, uninstalling can cause removing +# 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 +# case $distro in +# debian) +# pi chromium ;; +# trisquel|ubuntu) +# wget -qO - https://downloads.iridiumbrowser.de/ubuntu/iridium-release-sign-01.pub|sudo apt-key add - +# t=$(mktemp) +# cat >$t < /dev/null; then + s groupadd -g 450 debian-transmission + case $distro in arch) - # cdrkit for cloud-init isos - # dnsmasq for nat networking in libvirt - # qemu for qemu-img, bind-tools for dig - pi ttf-dejavu bash-completion unzip ntp wget xorg-xev xorg-xmodmap \ - virt-install bridge-utils cdrkit dnsmasq qemu spice-gtk3 bind-tools - sgo ntpd - s sed -ri '/^ *user *=/d' /etc/libvirt/qemu.conf - # otherwise we get error about accessing kvm module. - # seems like there might be a better way, but google was a bit vague. - 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 - sgo virtlogd.socket - sgo virtlogd.service - ;; -esac + 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 +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 case $distro in - *) pi at ;;& - arch) sgo atd ;; -esac + 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' +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' +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' => '/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" => 256, +"ratio-limit" => 5.0, +"ratio-limit-enabled" => true, +})) + "\n") +EOF -case $distro in - arch) pi virtviewer ;; - *) : ;; # other distros have it as a dependency afaik. + ;; + # todo: others unknown esac -case $distro in - arch) - # ubuntu 14.04 uses b-cron, - # but it's not maintained in arch. - # of the ones in the main repos, cronie is only one maintained. - # fcron appears abandoned software. - pi cronie - sgo cronie - ;; - *) : ;; # other distros come with cron. -esac +# trisquel 8 = openvpn, debian stretch = openvpn-client +vpn_ser=openvpn-client +if [[ ! -e /lib/systemd/system/openvpn-client@.service ]]; then + vpn_ser=openvpn +fi -case $distro in - fedora) cabal install shellcheck ;; - *) pi shellcheck ;; - # unknown for older ubuntu +s dd of=/etc/systemd/system/transmission-daemon-nn.service </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 - ubuntu) pi android-tools-adb ;; - arch) pi android-tools ;; - # other distros unknown + 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) pi unrar ;; - *) pi unrar-free ;; + 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 -# proprietary flash. going without for now -# case $distro in -# debian) -# pi flashplugin-nonfree -# esac -case $distro in - debian) pi curl ;; - arch) : ;; - # fedora: unknown -esac +# removed synergy since ive not used it in a long time + +pi --no-install-recommends kdeconnect +### kdeconnect for gnome. started in /a/bin/distro-setup/desktop-20-autostart.sh +### but gnome + xmonad not working in flidas, so i disabled it +# pi libgtk-3-dev python3-requests-oauthlib valac cmake python-nautilus libappindicator3-dev +# cd /a/opt/indicator-kdeconnect +# mkdir -p build +# cd build +# cmake .. -DCMAKE_INSTALL_PREFIX=/usr +# make +# sudo make install +# # we can start it manually with /usr/lib/x86_64-linux-gnu/libexec/kdeconnectd +# # it seems, according to +# # /etc/xdg/autostart/kdeconnectd.desktop +# # I'm not seeing the icon, but the clipboard replication is working + +### model 01 arduino support ### +# https://github.com/keyboardio/Kaleidoscope/wiki/Install-Arduino-support-on-Linux +# also built latest arduino in /a/opt/Arduino, (just cd build; ant build; ant run ) +# set arduino var in bashrc, +# have system config file setup too. +sudo adduser $USER dialout case $distro in - fedora) - cd $(mktemp -d) - wget http://tamacom.com/global/global-6.3.2.tar.gz - ex global* - cd global-6.3.2 - # based on https://github.com/leoliu/ggtags - ./configure --with-exuberant-ctags=/usr/bin/ctags - make - s make install - s pip install pygments - ;; - *) - pi global python2-pygments - ;; + 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 ######### end misc packages ######### - -# packages I once used before and liked, but don't want installed now for -# various reasons +# packages I once used before and liked, but don\'t want installed now for +# various reasons: # python-sqlite is used for offlineimap # lxappearance python-sqlite dolphin paman dconf-editor + + +######## unfinished + # todo, finish configuring smart. + +pi smartmontools # mostly from https://wiki.archlinux.org/index.php/S.M.A.R.T. # turn on smart. background on options: # first line, -a = test everyting on all devices. @@ -291,8 +1422,8 @@ esac # -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 "s#^[[:space:]]*DEVICESCAN.*#\ -DEVICESCAN -a -o on -S on -n standby,q $sched\ +s 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 # in the default configuration of at least ubuntu 14.04, resolvconf is @@ -301,147 +1432,148 @@ DEVICESCAN -a -o on -S on -n standby,q $sched\ # consulted first. This is often slower and undesirable, ie. local dns # queries go from 0ms to 10+ or 100+ ms. To reverse the ordering, you # can do: -#sudo sed -i '/tun\*\|tap\*/d' /etc/resolvconf/interface-order +#sudo sed -i --follow-symlinks '/tun\*\|tap\*/d' /etc/resolvconf/interface-order # however, this breaks dns lookup for hosts on the openvpn lan. # I can\'t figure out why hosts on the normal lan would not be # broken under the default ordering, except the host I was # testing with previously had an entry in /etc/hosts. +############# end unfinished -case $distro in - arch) - # default is alsa, doesn\'t work with with pianobar - s dd of=/etc/libao.conf <<'EOF' -default_driver=pulse -EOF - ;; -esac - +########### misc stuff -if [[ $HOSTNAME == treetowl ]]; then - case $distro in - arch) pi btrbk ;; - # others unknown - esac - pi fail2ban - s systemctl enable fail2ban - s systemctl start fail2ban +# make networkmanager use resolvconf instead of its own dnsmasq which +# conflicts with the normal dnsmasq package. +f=/etc/NetworkManager/NetworkManager.conf +m=$(md5sum $f) +s sed -ri '/ *\[main\]/,/^ *\[[^]]+\]/{/^\s*dns[[:space:]=]/d}' $f +if [[ $m != $(md5sum $f) ]]; then + srestart NetworkManager 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 +/a/bin/distro-setup/mymimes -# disable motd junk. -case $(distro-name) in - debian) - # allows me to pipe with ssh -t, and gets rid of spam - # http://forums.debian.net/viewtopic.php?f=5&t=85822 - # i'd rather disable the service than comment the init file - # this says disabling the service, it will still get restarted - # but this script doesn't do anything on restart, so it should be fine - s dd of=/var/run/motd.dynamic if=/dev/null - s update-rc.d motd disable - ;; - ubuntu) - # this isn't a complete solution. It still shows me when updates are available, - # but it's no big deal. - s t /etc/update-motd.d/10-help-text /etc/update-motd.d/00-header - ;; -esac -# automatic updates -# reference: -# https://debian-handbook.info/browse/stable/sect.regular-upgrades.html -# /etc/cron.daily/apt calls unattended-upgrades -# /usr/share/doc/unattended-upgrades# cat README.md -# /etc/apt/apt.conf.d/50unattended-upgrades -if isdebian; then - pi unattended-upgrade - s dd of=/etc/apt/apt.conf.d/10periodic <<'EOF' -APT::Periodic::Update-Package-Lists "1"; -APT::Periodic::Download-Upgradeable-Packages "1"; -APT::Periodic::AutocleanInterval "7"; -APT::Periodic::Unattended-Upgrade "1"; -EOF - { cat <<'EOF' -Unattended-Upgrade::Mail "root"; -Unattended-Upgrade::MailOnlyOnError "true"; -Unattended-Upgrade::Remove-Unused-Dependencies "true"; -EOF - if ! is_debian_testing; then - cat <<'EOF' -# default is just upgrade main and security, not updates. -# If it's not testing, just upgrade everything. -# These are stable packages only getting bugfixes anyways. -Unattended-Upgrade::Origins-Pattern { - "origin=*"; -}; +sgo dynamicipupdate + + +# stop autopoping windows when i plug in an android phone. +# 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 + + +# on grub upgrade, we get prompts unless we do this +devs=() +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 </etc/apt/apt.conf.d/50unattended-upgrades -fi +# btrfs maintenance +sgo btrfsmaint.timer +sgo btrfsmaintstop.timer -######### begin postfix ######## -# based on,http://www.postfix.org/qmgr.8.html and my notes in gnus -# originally tried moving specific directories under /var/spool/postfix, -# but postfix didn't like that -if [[ ! -L /var/spool/postfix ]]; then - ser stop postfix - s t /q/postfix - s mv /var/spool/postfix /q - s lnf /q/postfix /var/spool - ser start postfix - journalctl -n 20 -fi +# the wiki backup script from ofswiki.org uses generic paths +s lnf /p/c/machine_specific/li/mw_vars /root +s lnf /k/backup/wiki_backup /root + -# send mail to a better place than /var/mail/ian -s sed -i '/^root/d' /etc/aliases ||: -echo "root: $HOSTNAME@bog.mm.st" | s tee -a /etc/aliases -# this can't be a symlink and has permission restrictions -# it might work in /etc/aliases, but this seems more proper. -e "$HOSTNAME@bog.mm.st" > ~/.forward -s newaliases - -# i'm assuming mail just won't work on systems without the sasl_passwd. -postconfin <<'EOF' -smtp_sasl_auth_enable = yes -smtp_sasl_password_maps = hash:/q/root/sasl_passwd -smtp_sasl_security_options = noanonymous -smtp_tls_security_level = secure -message_size_limit = 20480000 -smtp_tls_CAfile = /etc/ssl/certs/ca-certificates.crt -EOF -# ^ I ran into a log file not sending cuz of size. double from 10 to 20 meg limit - -# offlineimap uses this too, it is much easier to use one location than to -# condition it's config and postfix's config case $distro in - fedora) s lnf -T ca-certificates.crt /etc/ssl/ca-bundle.trust.crt ;; - *) : + trisquel|ubuntu|debian) + # unison-gtk second, i want it to be default, not sure if that works + # with spa. note, I used to install from testing repo when using stable, + # but it shouldn't be needed since I wrote a script to handle mismatching + # compilers. + spa unison unison-gtk + ;; + arch) + spa unison gtk2 + ;; esac -ser enable postfix -ser start postfix +case $distro in + arch) + # default is alsa, doesn\'t work with with pianobar + s dd of=/etc/libao.conf <<'EOF' +default_driver=pulse +EOF + ;; +esac -############ end postfix ####### +# # disabled due to my patch being in btrbk +# case $distro in +# arch|debian|trisquel|ubuntu) pi btrbk ;; +# # others unknown +# esac +cd /a/opt/btrbk +s make install + +sgo btrbk.timer +# note: to see when it was last run, +# ser list-timers +end_msg <<'EOF' +In mate settings settings, change scrolling to two-finger, +because the default edge scroll doesn\'t work. Originally found this in debian. +EOF + case $distro in - debian|ubuntu) s gpasswd -a ian adm ;; #needed for reading logs + debian) + # remove dep that came in with desktop + pu transmission-gtk + ;; esac -# 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 + debian|trisquel|ubuntu) s gpasswd -a iank adm ;; #needed for reading logs +esac +/a/bin/buildscripts/pithosfly + + +# based on guix manual instructions, also added code to profile +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 + +# 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 - # todo on fedora: setup non-dev packages - fedora) - s dd of=/etc/yum.repos.d/torproject.repo <<'EOF' +#### 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 @@ -458,31 +1590,35 @@ gpgcheck=1 gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.asc EOF - # 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 - ;; - debian) - tu /etc/apt/sources.list 'deb http://deb.torproject.org/torproject.org trusty 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 - ;; - arch) - pi tor tor-browser-en - sgo tor - ;; - # ubuntu unknown + # 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) - read -r -d '' fedora_end_msg <<'EOF' + 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 @@ -499,36 +1635,60 @@ make sure to reload the firewall to load the persistent configuration EOF - pi nfs-utils - sgo nfs-server - ;; - debian|ubuntu) - pi nfs-server - ;; - arch) - pi nfs-utils - sgo rpcbind - sgo nfs-server - ;; + pi nfs-utils + ;; + debian|trisquel|ubuntu) + pi-nostart nfs-server + ;; + arch) + pi nfs-utils || pending_reboot=true + ;; esac -# nohide = export filesystems mounted deeper than the export point -# fsid=0 makes this export the "root" export -# not documented in the man page, but this means -# 1. it can be mounted with a shorthand of server:/ -# 2. exports that are subdirectories of this one will automatically be mounted -tu /etc/exports '/i/video 192.168.1.0/24(rw,fsid=0,nohide,no_root_squash,async,no_subtree_check,insecure)' -s exportfs -rav -showmount -e localhost +# networkmanager has this nasty behavior on flidas: if the machine +# crashes with dnsmasq running, on subsequent boot, it adds an entry to +# resolvconf for 127.0.0.1 in some stupid attempt to restore +# nameservers. +# This can be manually fixed by stoping dnsmasq, +# 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 + + +if [[ $HOSTNAME == frodo ]]; then + # nohide = export filesystems mounted deeper than the export point + # fsid=0 makes this export the "root" export + # not documented in the man page, but this means + # 1. it can be mounted with a shorthand of server:/ + # 2. exports that are subdirectories of this one will automatically be mounted + 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 +fi + + +e "$end_msg_var" + + + +# if I was going to create a persistent vm, i might do it like this: +# variant=something # from: virt-install --os-variant list +# s virt-install --noautoconsole --graphics spice,listen=0.0.0.0 \ + # --disk=/a/images/some_name.qcow2,bus=virtio --vcpus 2 -r 4096 -w bridge=br0 \ + # -n some_name --import --os-variant $variant --cpu host-model-only -# cron -f=/a/bin/$HOSTNAME-crontab -if [[ -e $f ]]; then - $f -fi +######### begin stuff belonging at the end ########## -if [[ ${distro}_end_msg ]]; then - echo ${distro}_end_msg +echo 0 >~/.local/distro-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