X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=blobdiff_plain;f=distro-end;h=317852291a0d21fb83764c2d7225f0c5a0f5dd66;hp=1288c7580202f20381526526772f5d2000623c00;hb=79b274fcd8bfa556133ab13270e84b40aebe8468;hpb=48fdb1ea98aff5633ec228332f54534872c50f98 diff --git a/distro-end b/distro-end index 1288c75..3178522 100755 --- a/distro-end +++ b/distro-end @@ -1,288 +1,1294 @@ #!/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 + +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" +} +end() { + e "$end_msg_var" + 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 +} +pre="${0##*/}:" +s() { + printf "s %s\n" "$*" + SUDOD="$PWD" sudo -i "$@"; +} +sd() { + s 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 +#### 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 - + sd /etc/apt/preferences.d/flidas-xenial </dev/null </dev/null; then + s apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32 + sd /etc/apt/preferences.d/flidas-bionic <$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 + # avoid restarting if possible, reconnecting to irc is annoying. + if [[ $(ser is-active znc) != active ]]; then + m sgo znc + fi + ###### stop znc setup ##### + + end + ;; +esac +###### 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 -# proprietary flash. going without for now + + +# 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) + + +m sgo fsf-vpn-dns-cleanup + + +# website is dead june 14 2019. back in october, but meh +s rm -fv /etc/apt/sources.list.d/iridium-browser.list # case $distro in -# debian) -# pi flashplugin-nonfree +# 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 + s 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 + +# 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 +####### end transmission + + + +# trisquel 8 = openvpn, debian stretch = openvpn-client +vpn_ser=openvpn-client +if [[ ! -e /lib/systemd/system/openvpn-client@.service ]]; then + vpn_ser=openvpn +fi + +sd /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 </etc/apt/apt.conf.d/50unattended-upgrades -fi +# btrfs maintenance +sgo btrfsmaint.timer +sgo btrfsmaintstop.timer +# aren't autoupdating this, but I do check on it somewhat regularly. +m cd /a/opt/btrbk +s make install -######### 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 +m sgo btrbk.timer +# note: to see when it was last run, +# ser list-timers -# 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 ;; - *) : -esac -ser enable postfix -ser start postfix +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 -############ end postfix ####### +# Remove dep that came in with desktop to fix associations. +m pu transmission-gtk +s gpasswd -a iank adm #needed for reading logs -case $distro in - debian|ubuntu) s gpasswd -a ian adm ;; #needed for reading logs -esac +m /a/bin/buildscripts/pithosfly -# 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 - - # 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 -esac -# nfs server -case $distro in - fedora) - read -r -d '' 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 - - -EOF - pi nfs-utils - sgo nfs-server - ;; - debian|ubuntu) - pi nfs-server - ;; - arch) - pi nfs-utils - sgo rpcbind - sgo nfs-server - ;; -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 +# # 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 -# cron -f=/a/bin/$HOSTNAME-crontab -if [[ -e $f ]]; then - $f +pi tor +m /a/bin/buildscripts/tor-browser + +# 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 +# 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 -if [[ ${distro}_end_msg ]]; then - echo ${distro}_end_msg -fi + + + +# 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 + + + +######### begin stuff belonging at the end ########## + +end