X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=blobdiff_plain;f=distro-end;h=317852291a0d21fb83764c2d7225f0c5a0f5dd66;hp=b55fabc73eaa25e9cdb550ba4c24c8eb7e8a503b;hb=79b274fcd8bfa556133ab13270e84b40aebe8468;hpb=f3e6a97425746ed185c28dcc03acf7e67a6af560 diff --git a/distro-end b/distro-end index b55fabc..3178522 100755 --- a/distro-end +++ b/distro-end @@ -1,289 +1,463 @@ #!/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 - wcd -) +# 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 </dev/null; then - # this condition is just a speed optimization - pi apt-file - s apt-file update - fi - # for debconf-get-selections - spa debconf-utils - ;; -esac -case $distro in - ubuntu|debian) spa ack-grep ;; - arch|fedora) spa ack ;; - # fedora unknown -esac + t=$(mktemp) + cat >$t <$t <$t <>/etc/hosts" | s tee -a $f - sgo openvpn - domain=cal.iankelling.org - acme-tiny-wrapper $domain - apache-site -f 10.8.0.4:5232 - $domain <<'EOF' + 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 - - 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 - +# 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 - # nginx version of above would be: - # auth_basic "Not currently available"; - # auth_basic_user_file /etc/nginx/caldav/htpasswd; + # nginx version of above would be: + # auth_basic "Not currently available"; + # auth_basic_user_file /etc/nginx/caldav/htpasswd; - ########## begin pump.io setup ########## - # once pump adds a logrotation script, turn off nologger, - # and add - # "logfile": "/var/log/pumpio/pumpio.log", - # - s dd of=/etc/pump.io.json <<'EOF' -{ - "secret": "SECRET_REPLACE_ME", - "driver": "mongodb", - "params": { "dbname": "pumpio" }, - "noweb": false, - "site": "pump.iankelling.org", - "owner": "Ian Kelling", - "ownerURL": "https://iankelling.org/", - "port": 8001, - "urlPort": 443, - "hostname": "pump.iankelling.org", - "nologger": true, - "datadir": "/home/pumpio/pumpdata", - "enableUploads": true, - "debugClient": false, - "disableRegistration": true, - "noCDN": true, - "key": "/home/pumpio/pump.iankelling.org-domain.key", - "cert": "/home/pumpio/pump.iankelling.org-chained.pem", - "address": "localhost", - "sockjs": false -} -EOF - s sed -i "s#SECRET_REPLACE_ME#$(cat /p/c/machine_specific/li/pump-secret)#" /etc/pump.io.json - - # jessie\'s node is too old - # https://nodejs.org/en/download/package-manager/ - curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash - - pi nodejs - cd /home/ian - rm -rf pump.io.git - git clone https://github.com/pump-io/pump.io.git - cd pump.io - # note: doing this or the npm install pump.io as root had problems. - npm install - npm run build - # normally, next command would be - # s npm install -g databank-mongodb - # but it\'s this until a bug in pump gets fixed - s npm install -g databank-mongodb@0.19.2 - s useradd -m -s /bin/false pumpio - sudo -u pumpio mkdir -p /home/pumpio/pumpdata - # for testing browser when only listening to localhost, - # in the pump.io.json, set hostname localhost, urlPort 5233 - #ssh -L 5233:localhost:5233 li - acme-tiny-wrapper -c /home/pumpio pump.iankelling.org - - s mkdir -p /var/log/pumpio/ - s chown pumpio:pumpio /var/log/pumpio/ - - apache-site -c /home/pumpio - pump.iankelling.org <<'EOF' -# currently a bug in pump that we cant terminate ssl - SSLProxyEngine On - ProxyPreserveHost On - ProxyPass / https://127.0.0.1:8001/ - ProxyPassReverse / https://127.0.0.1:8001/ - # i have sockjs disabled per people suggesting that - # it won\'t work with apache right now. - # not sure if it would work with this, - # but afaik, this is pointless atm. - - ProxyPass wss://127.0.0.1:8001/main/realtime/sockjs/ - ProxyPassReverse wss://127.0.0.1:8001/main/realtime/sockjs/ - + ###### 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 - s dd of=/etc/systemd/system/pump.service <<'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=pump.io -After=syslog.target network.target +Description=ZNC, an advanced IRC bouncer +After=network-online.target [Service] -Type=simple -User=pumpio -Group=pumpio -ExecStart=/home/ian/pump.io/bin/pump -Environment=NODE_ENV=production -# failed to find databank-mongodb without this. -# I just looked at my environment variables took a guess. -Environment=NODE_PATH=/usr/lib/nodejs:/usr/lib/node_modules:/usr/share/javascript +ExecStart=/usr/bin/znc -f --datadir=/var/lib/znc +User=znc [Install] WantedBy=multi-user.target EOF - ser daemon-reload - sgo pump - ########## end pump.io setup ############ - - - ############# begin setup mastodon ############## - - # https://store.docker.com/editions/community/docker-ce-server-debian?tab=description - pi software-properties-common - curl -fsSL https://download.docker.com/linux/debian/gpg | sudo apt-key add - - sudo add-apt-repository \ - "deb [arch=amd64] https://download.docker.com/linux/debian \ - $(lsb_release -cs) \ - stable" - p update - pi docker-ce - sgo docker - # this may not be needed - ser start docker - - curl -L https://github.com/docker/compose/releases/download/1.12.0/docker-compose-`uname -s`-`uname -m` | s dd of=/usr/local/bin/docker-compose - s chmod +x /usr/local/bin/docker-compose - - # i subscrubed to https://github.com/docker/compose/releases.atom - # to deal with updates manually. - - cd ~ - i clone https://github.com/tootsuite/mastodon - cd mastodon - # https://github.com/tootsuite/mastodon/tree/v1.1.2 - # subbed to atom feed to deal with updates - i co v1.1.2 - - # per instructions, uncomment redis/postgres persistence in docker-compose.yml - sed -i 's/^#//' docker-compose.yml - - cat >.env.production <<'EOF' -REDIS_HOST=redis -REDIS_PORT=6379 -DB_HOST=db -DB_USER=postgres -DB_NAME=postgres -DB_PASS= -DB_PORT=5432 - -LOCAL_DOMAIN=mast.iankelling.org -LOCAL_HTTPS=true - -SINGLE_USER_MODE=true - -SMTP_SERVER=10.8.0.4 -SMTP_PORT=25 -SMTP_LOGIN=li -SMTP_FROM_ADDRESS=notifications@mast.iankelling.org -SMTP_DOMAIN=mast.iankelling.org -SMTP_DELIVERY_METHOD=smtp -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 ##### - for key in PAPERCLIP_SECRET SECRET_KEY_BASE OTP_SECRET; do - printf "%s=%s" $key "$(docker-compose run --rm web rake secret)" >>.env.production - done - s cat /etc/mailpass| while read -r domain port pass; do - if [[ $domain == mail.iankelling.org ]]; then - printf "SMTP_PASSWORD=%s" "$pass" >>.env.production - break - fi - done - - - - docker-compose run --rm web rails assets:precompile - - # docker daemon takes care of starting on boot. - docker-compose up -d - - acme-tiny-wrapper mast.iankelling.org - s a2enmod proxy_wstunnel headers - apache-site -f 3000 - mast.iankelling.org <<'EOF' - ProxyPreserveHost On - RequestHeader set X-Forwarded-Proto "https" - ProxyPass /500.html ! - ProxyPass /oops.png ! - ProxyPass /api/v1/streaming/ ws://localhost:4000/ - ProxyPassReverse /api/v1/streaming/ ws://localhost:4000/ - ErrorDocument 500 /500.html - ErrorDocument 501 /500.html - ErrorDocument 502 /500.html - ErrorDocument 503 /500.html - ErrorDocument 504 /500.html -EOF + 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 - ############### !!!!!!!!!!!!!!!!! - ############### manual steps: - # only following 2 people atm, so not bothering to figure out backups - # when mastodon has not documented it at all. - # - # fsf@status.fsf.org - # cwebber@toot.cat - # dbd@status.fsf.org - # johns@status.fsf.org - # sign in page is at https://mast.iankelling.org/auth/sign_in - # register as iank, then - # https://github.com/tootsuite/documentation/blob/master/Running-Mastodon/Administration-guide.md - # docker-compose run --rm web bundle exec rails mastodon:make_admin USERNAME=iank - ############# end setup mastodon ############## +# TODO: some of the X programs can be removed from pall when using wayland - echo "$0: $(date): ending now)" - exit 0 - ;; -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) -########### end section including li/lj ############### +m sgo fsf-vpn-dns-cleanup -if [[ $HOSTNAME == treetowl ]]; then - # note, see bashrc for more documentation. - pi rss2email - s dd of=/etc/systemd/system/rss2email.service <<'EOF' + +# 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 - - # the folder was moved here after an install around 02/2017. - # it contains runtime data, - # plus a simple symlink to the config file which it\'s - # not worth separating out. - s lnf -T /i/transmission-daemon /var/lib/transmission-daemon/.config/transmission-daemon - # - # config file documented here, and it\'s the same config - # for daemon vs client, so it\'s documented in the gui. - # 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' +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({ @@ -773,73 +1108,84 @@ File.write(p, JSON.pretty_generate(JSON.parse(File.read(p)).merge({ "ratio-limit-enabled" => true, })) + "\n") EOF +####### end transmission - # make sure its not enabled, not sure if this is needed - ser disable transmission-daemon - sgo transmission-daemon-nn - ;; - # todo: others unknown - 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 -# 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 +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 - s apt-get -fy install - else - exit 1 - fi - ;; - esac - ;; - arch) - pi google-chrome - ;; - esac - ;; -esac - -# 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 -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 - -case $distro in - # optional dep for firefox for h.264 video - arch) spa gst-libav ;; - # other distros, probably come by default -esac - -case $distro in - fedora|ubuntu|debian) spa gnupg-agent ;; - arch) : ;; -esac - - -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 - + done +fi +######### end transmission client setup ###### -case $distro in - arch) spa ttf-dejavu;; - debian|ubuntu) spa fonts-dejavu ;; - # others unknown -esac +### printer setup +pi cups hplip +s gpasswd -a $USER lpadmin # based on ubuntu wiki +# 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. -case $distro in - arch) spa xorg-xev;; - debian|ubuntu) spa x11-utils ;; - # others unknown -esac -case $distro in - arch) pi virt-install;;& - debian|ubuntu) pi virtinst ;;& - *) pi virt-manager ;; # creates the libvirt group in debian at least - # others unknown -esac # allow user to run vms, from debian handbook -for x in ian traci; do s usermod -a -G libvirt,kvm $x; done +for x in iank user2; do s usermod -a -G libvirt,kvm $x; done # bridge networking as user fails. google lead here, but it doesn\'t work: # oh well, I give up. # http://wiki.qemu.org/Features-Done/HelperNetworking # s mkdir /etc/qemu # f=/etc/qemu/bridge.conf -# s dd of=$f <<'EOF' +# sd $f <<'EOF' # allow br0 # EOF # #s chown root:qemu $f # debian has somethig like qemu-libvirt. equivalent? # s chmod 640 $f - -case $distro in - arch) spa cdrkit;; - debian|ubuntu) spa genisoimage;; - # others unknown -esac - -case $distro in - arch) spa spice-gtk3 ;; - debian|ubuntu) spa spice-client-gtk;; - # others unknown -esac - # general known for debian/ubuntu, not for fedora -case $distro in - debian|ubuntu) - pi golang-go - # a bit of googling, and added settings to bashrc - go get -u github.com/mvdan/fdroidcl/cmd/fdroidcl - ;; - # others unknown -esac - +m /a/bin/buildscripts/go +m /a/bin/buildscripts/rust +m /a/bin/buildscripts/misc -case $distro in - arch) - # cdrkit for cloud-init isos - # dnsmasq & ebtables for nat networking in libvirt - # qemu for qemu-img, bind-tools for dig - # dmidecode just because syslog complains - pi unzip xorg-xmodmap dmidecode ebtables\ - bridge-utils dnsmasq qemu bind-tools - # 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 - # https://bbs.archlinux.org/viewtopic.php?id=206206 - # # this should prolly go in the wiki - sgo virtlogd.socket - # guessing this is not needed - #sgo virtlogd.service - sgo libvirtd - - ;; -esac - -case $distro in - arch) pi virtviewer ;; - *) : ;; # other distros have it as a dependency afaik. -esac - - - -case $distro in - fedora) cabal install shellcheck ;; - *) spa shellcheck ;; - # unknown for older ubuntu -esac - - -case $distro in - arch|debian|ubuntu) spa pumpa ;; - # others unknown. do have a buildscript: - # /a/bin/buildscripts/pumpa ;; -esac - - -case $distro in - debian|ubuntu) spa android-tools-adbd/unstable ;; - arch) spa android-tools ;; - # other distros unknown -esac +pi-nostart virtinst virt-manager -if [[ $HOSTNAME == treetowl ]]; then - case $distro in - debian) - if [[ `debian-archive` == testing ]]; then - # has no unstable dependencies - pi bitcoind/unstable - src=/a/opt/bitcoin/contrib/init/bitcoind.service - s cp $src /etc/systemd/system - p=/etc/bitcoin/bitcoin - dst=/etc/systemd/system/bitcoinjm.service - # jm for joinmarket - $sed -r "/^\s*ExecStart/s,${p}.conf,${p}jm.conf," $src \ - >/etc/systemd/system/bitcoinjm.service - - d=jm; jm=d # being clever for succinctness - for s in d jm; do - s $sed -ri "/^\s*\[Unit\]/a Conflicts=bitcoin${!s}.service" \ - /etc/systemd/system/bitcoin${s}.service - done - - ser daemon-reload - - dir=/nocow/.bitcoin - s mkdir -p $dir - s chown -R bitcoin:bitcoin $dir - dir=/etc/bitcoin - s mkdir -p $dir - s chown -R root:bitcoin $dir - s chmod 750 $dir - - # pruning decreases the bitcoin dir to 2 gb, keeps - # just the recent blocks. can\'t do a few things like - # import a wallet dump. - # pruning works, but people had to do - # some manual stuff in joinmarket. I dun need the - # disk space, so not bothering yet, maybe in a year or so. - # https://github.com/JoinMarket-Org/joinmarket/issues/431 - #https://bitcoin.org/en/release/v0.12.0#wallet-pruning - #prune=550 - - f=$dir/bitcoin.conf - s dd of=$f </dev/null < x.html -EOF - - -case $distro in - debian|ubuntu) - case `debian-archive` in - stable) - s dd of=/etc/apt/preferences.d/unison-gtk <<'EOF' -Explanation: Allow unison-gtk to be upgraded -Package: unison-gtk -Pin: release a=testing -Pin-Priority: 500 -EOF - # dont think using testing is needed since I figured out how to - # deal with mismatching unison compilers, but I dont - # see any reason to revert it, since it only installs - # a single package which is primarily a single binary - ;; - esac - pi unison/testing - pi unison-gtk/testing # after to make it the default unison - ;; - arch) - pi unison gtk2 - ;; -esac - -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 - -# note, for jessie, it depends on a higher version of btrfs-tools. -# -# # disabled due to my patch being in btrbk -# case $distro in -# arch|debian|ubuntu) pi btrbk ;; -# # others unknown -# esac -cd /a/opt/btrbk -s make install -spa pv # for progress bar when running interactively. -if [[ $HOSTNAME == treetowl ]]; then - # backup/sync manually on others hosts for now. - sgo btrbk.timer - # note: to see when it was last run, - # ser list-timers +# 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 -if [[ $HOSTNAME == treetowl ]] && [[ `debian-archive` != testing ]]; then - # fail2 ban is broken, with a workaround, per - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=770171 - # ill wait a while to see if it gets fixed - pi fail2ban - sgo fail2ban -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 +m /a/bin/distro-setup/mymimes +m sgo dynamicipupdate -case $distro in - debian|ubuntu) s gpasswd -a ian adm ;; #needed for reading logs -esac +# 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 +m dbus-launch gsettings set org.gnome.desktop.media-handling automount-open false -# 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 + +# 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 </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 - -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. - - if [[ -e /nocow/user/vms/win10.qcow2 ]]; then - 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 - fi +# # 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 - if [[ -e /nocow/user/vms/win7.qcow2 ]]; then - # 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 - fi -fi -if [[ $HOSTNAME == treetowl ]]; then - 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 +pi tor +m /a/bin/buildscripts/tor-browser - # 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 = /kr +# 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 - 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 + s exportfs -rav fi -tu /etc/hosts <<< "127.0.1.1 $(hostname).lan $(hostname)" - -######### 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