X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=blobdiff_plain;f=distro-end;h=317852291a0d21fb83764c2d7225f0c5a0f5dd66;hp=13a4dd102c6c8d49b6993155d79cbf1362abe9ae;hb=79b274fcd8bfa556133ab13270e84b40aebe8468;hpb=a9242586e509be25c1b3f746f6cdb45104c5e9f5 diff --git a/distro-end b/distro-end index 13a4dd1..3178522 100755 --- a/distro-end +++ b/distro-end @@ -1,771 +1,1283 @@ #!/bin/bash -l -# Copyright (C) 2016 Ian Kelling +# Copyright (C) 2019 Ian Kelling +# SPDX-License-Identifier: AGPL-3.0-or-later -# 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 +### setup +source /a/bin/errhandle/err +src="$(readlink -f -- "${BASH_SOURCE[0]}")"; src=${src%/*} # directory of this file -# 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. +if [[ $EUID == 0 ]]; then + echo "$0: error: run as regular user" >&2 + exit 1 +fi -errcatch +_errcatch_cleanup() { + echo 1 >~/.local/distro-end +} -set -x +# shellcheck source=./pkgs +source $src/pkgs exec &> >(sudo tee -a /var/log/distro-end) echo "$0: $(date): starting now)" - -src="${BASH_SOURCE%/*}" - +# see example of usage to understand. end_msg() { - = local y - IFS= read -r -d '' y ||: - end_msg_var+="$y" + local y + IFS= read -r -d '' y ||: + end_msg_var+="$y" } - -spa() { # simple package add - simple_packages+=($@) +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 -simple_packages=( - htop - mailutils - nmon - rdiff-backup - ruby - ruby-rest-client - tree - vim -) +# 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 < '127.0.0.1,192.168.1.*', -'rpc-authentication-required' => false, -'incomplete-dir' => '/i/k/partial-torrents', -'download-dir' => '/i/k/torrents', -"speed-limit-up" => 700, -"speed-limit-up-enabled" => true, -"ratio-limit" => 1.4000, -"ratio-limit-enabled" => true, -})) + "\n") + ser daemon-reload + m sgo vpnmail.service + # needed for li's local mail delivery. + tu /etc/hosts <<<"10.8.0.4 mail.iankelling.org" + m sgo $vpn_service + # setup let's encrypt cert + m web-conf apache2 mail.iankelling.org + s rm -fv /etc/apache2/sites-enabled/mail.iankelling.org{,-redir}.conf + ser reload apache2 + + domain=cal.iankelling.org + web-conf -f 10.8.0.4:5232 - apache2 $domain <<'EOF' +#https://httpd.apache.org/docs/2.4/mod/mod_authn_core.html#authtype +# https://stackoverflow.com/questions/5011102/apache-reverse-proxy-with-basic-authentication + + 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 - sgo transmission-daemon - ;; - arch) - # todo, setup it's config file & daemon - pi transmission-cli - ;; - esac -fi + # nginx version of above would be: + # auth_basic "Not currently available"; + # auth_basic_user_file /etc/nginx/caldav/htpasswd; -# adapted from /var/lib/dpkg/info/transmission-daemon.postinst -if ! getent passwd debian-transmission > /dev/null; then - case $distro in - arch) - s useradd \ - --system \ - --create-home \ - --home-dir /var/lib/transmission-daemon \ - --shell /bin/false \ - debian-transmission - ;; - *) - s adduser --quiet \ - --system \ - --group \ - --no-create-home \ - --disabled-password \ - --home /var/lib/transmission-daemon \ - debian-transmission - ;; - esac -fi -# dunno why it's there, but get rid of it -case $HOSTNAME in - li|lj) s rm -rf /home/linode ;; -esac -# arch had a default config, -# debian had nothing until you start it. -# With a little trial an error, here is a minimal config -# taken from the generated one, plus changes that the -# settings ui does, without a bunch of ui crap settings. -# -# only settings I set were -# hostname -# auto-connect -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' -{ - "profiles" : [ - { - "profile-name" : "Default", - "hostname" : "frodo", - "rpc-url-path" : "/transmission/rpc", - "username" : "", - "password" : "", - "auto-connect" : true, - "ssl" : false, - "timeout" : 40, - "retries" : 3, - "update-active-only" : false, - "activeonly-fullsync-enabled" : false, - "activeonly-fullsync-every" : 2, - "update-interval" : 3, - "min-update-interval" : 3, - "session-update-interval" : 60, - "exec-commands" : [ - ], - "destinations" : [ - ] - } - ], - "profile-id" : 0, - "add-options-dialog" : false -} + ###### 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 -done -case $distro in - debian|ubuntu) - pi-nostart openvpn - # pi-nostart this doesnt seem to be good enough? - ser disable openvpn@client - ser disable openvpn - ;; - # suggests because we want the resolvconf package - *) pi --install-suggests openvpn;; -esac + # 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 -pi wget -case $HOSTNAME in - tp|frodo) - case $distro in - debian|ubuntu) - log=$(mktemp) - cd /a/opt - wget -nv -N https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb - errallow - set -o pipefail - s dpkg -i google-chrome-stable_current_amd64.deb |& tee $log - code=$? - errcatch - case $code in - 0) : ;; - *) - # previously I had a more specific search, but dpkg - # changed it's output as of 7/2016 - if grep 'dependency problems' \ - $log &>/dev/null; then - s apt-get -fy install - else - exit 1 - fi - ;; -esac -;; -arch) - pi google-chrome +[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 -;; -esac +###### end website setup -# printer -case $distro in - arch) - pi cups ghostscript gsfonts # from arch wiki cups page - pi hplip # from google - s gpasswd -a $USER sys # from arch wiki - sgo org.cups.cupsd.service - # goto http://127.0.0.1:631 - # administration tab, add new printer button. - # In debian, I could use hte recommended driver, - # in arch, I had to pick out the 6L driver. - ;; - debian|ubuntu) - spa hplip - ;; - # other distros unknown +########### 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 -case $distro in - ubuntu|debian) pi --no-install-recommends mairix notmuch ;; - fedora|arch) spa mairix notmuch ;; -esac -case $distro in - arch) spa nfs-utils ;; - ubuntu|debian) spa nfs-client ;; -esac -case $distro in - ubuntu|debian) spa par2 ;; - arch|fedora) spa par2cmdline ;; -esac -# needed for my tex resume -case $distro in - ubuntu|debian) spa texlive-full ;; - arch) spa texlive-most ;; - # fedora unknown -esac -case $distro in - ubuntu) - # flash, unrar, codecs, ms fonts. - # This has a manual prompt. - spa ubuntu-restricted-extras - ;; - fedora) - pi yum-utils - # rpm fusion recommended codecs - s su -c "yum localinstall -y --nogpgcheck http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm" - pi gstreamer-plugins-ugly gstreamer-plugins-bad gstreamer-ffmpeg\ - xine-lib-extras-freeworld - ;; -esac +# TODO: some of the X programs can be removed from pall when using wayland -case $distro in - # optional dep for firefox for h.264 video - arch) spa gst-libav ;; - # other distros, probably come by default -esac +# 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) -case $distro in - fedora|ubuntu|debian) spa gnupg-agent ;; - arch) : ;; -esac +m sgo fsf-vpn-dns-cleanup -case $distro in - fedora) spa pinentry-gtk ;; - *) : ;; # comes default or with other packages -esac -case $distro in - arch) spa firefox pulseaudio;; - *) : ;; # comes default or with other packages -esac +# 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 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 </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 -# persistent virtual machines -case $distro in - debian|ubuntu) - pi libosinfo-bin; - ;; -esac -# distro may not know about win 10 yet. -variant=win7 -if ! virt-install --os-variant list &>/dev/null; then # we are using a newer virt-install - for v in 10 8.1 8; do - if osinfo-query os | gr "^\s*win${v/./\\.}\s" &>/dev/null; then - variant=win$v - break - fi - done -fi +pi tor +m /a/bin/buildscripts/tor-browser -if ! s virsh list --all --name | grep -xF win10 &>/dev/null; then - - # created account with - # win10vmian@outlook.com, and easy to remember password - # win 10 virtio, makes disk way way way faster - # wget https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/latest-virtio/virtio-win.iso - # https://wiki.archlinux.org/index.php/QEMU#Change_Existing_Windows_VM_to_use_virtio - # for installing virtio after initial install instead of with initial iso: - # qemu-img create -f qcow2 fake.qcow2 1G - # --disk=/a/images/virtio-win.iso,device=cdrom \ - # --disk=/a/images/fake.qcow2,bus=virtio - # Also, - # went to device manager, saw 2 pci devices with yellow !, - # did search for drivers, pick cdrom location, done. - # - # from http://www.tenforums.com/tutorials/4189-fast-startup-turn-off-windows-10-a.html. - # google said there was a control panel option for it, but - # that turned out to be a lie. - # Put this in a .bat file and run as administrator to turn off - # hyberboot which fucks things up. - # REG ADD "HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Power" /V HiberbootEnabled /T REG_dWORD /D 0 /F - # power settings, turn off display: never - # run "control userpasswords2", turn on automatic login. - # note: when changing devices, I just undefine, the create the vm again. - - 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 - - s virsh destroy win10 - - # 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 \ - -n win7 --import --os-variant win7 --cpu host-model-only - s virsh destroy win7 - # had a problem with --cpu host, so trying out - # --cpu host-model-only +# nfs server +pi-nostart nfs-kernel-server -fi +# 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 -pi samba -# note samba re-reads it's config every 1 minute -case $distro in - arch) s cp /etc/samba/smb.conf.default /etc/samba/smb.conf ;; -esac - -# add 2 lines after workgroup option -s sed -ri --follow-symlinks '/^\s*encrypt passwords\s*=/d' /etc/samba/smb.conf -s sed -ri --follow-symlinks '/^\s*map to guest\s*=/d' /etc/samba/smb.conf -s sed -i --follow-symlinks 's/\(\s*workgroup\s*=\).*/\1 WORKGROUP\n\tencrypt passwords = yes\n\tmap to guest = bad password/' /etc/samba/smb.conf -# remove default homes section. not sharing that. -s sed -ri --follow-symlinks '/^\s*\[homes\]/,/\s*\[/d' /etc/samba/smb.conf - -if ! grep -xF '[public]' /etc/samba/smb.conf &>/dev/null; then - s tee -a /etc/samba/smb.conf <<'EOF' -[public] - guest ok = yes - read only = no - path = /kfrodo +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 -fi - -case $distro in - debian|ubuntu) - # systemd claims it generates units from /etc/init.d, but it - # clearly doesn\'t in debian. I have no idea how they are - # related. fuck debian right now. It\'s not documented. samba - # has a systemd init file linked to /dev/null. There\'s this - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=769714 which - # claims samba\'s sub-services will be started automatically by - # systemd... it didn\'t on install, wonder if it will on - # boot. It clued me in how to start it manually though. Nothing - # in /usr/share/doc/samba, debian admin guide says nothing about - # any of this. (this is in debian testing as of 4/2016). - - s /etc/init.d/samba start - ;; - arch) - sgo samba - ;; -esac - -tu /etc/hosts <<< "127.0.1.1 $(hostname).lan $(hostname)" - - - -rootdev=$(mount | sed -rn 's#^(\S+) on / .*#\1#p') -s mkdir /mnt/root -tu /etc/fstab <<< "$rootdev /mnt/root btrfs noatime,subvolid=0 0 0" -mountpoint /mnt/root || s mount /mnt/root -idev=$(mount | sed -rn 's#^(\S+) on /i .*#\1#p') -if [[ $idev != $rootdev ]]; then - s mkdir /mnt/iroot - tu /etc/fstab <<< "$idev /mnt/iroot btrfs noatime,subvolid=0 0 0" - mountpoint /mnt/iroot || s mount /mnt/iroot + s exportfs -rav fi -######### begin stuff belonging at the end ########## -# Apps we want to override others for default file handler: -# simplest way in debian is to just install them last. -simple_packages+=( - mpv -) -case $distro in - ubuntu|debian) - spa spacefm-gtk3 ;; - arch) - spa spacefm ;; -esac +# 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 -pi "${simple_packages[@]}" +######### 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 +end