X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=distro-end;h=d72adea591e501549cfd1669e4fd6c210dd31fd0;hb=90bd397922e7240c41377e7404f79f190bfbc9d8;hp=f12d57515672f0de4020fb8a1b840b21fd26c983;hpb=82b146c2299fce1aec68d492e4bd881d81e8e6c9;p=distro-setup diff --git a/distro-end b/distro-end index f12d575..d72adea 100755 --- a/distro-end +++ b/distro-end @@ -13,395 +13,1190 @@ # See the License for the specific language governing permissions and # limitations under the License. +### setup errcatch +src="${BASH_SOURCE%/*}" +source $src/pkgs set -x - 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+=($@) + simple_packages+=($@) } - distro=$(distro-name) - pending_reboot=false - +sed="sed --follow-symlinks" # template case $distro in esac +#### initial packages pup - -simple_packages=( - htop - mailutils - nmon - rdiff-backup - ruby - ruby-rest-client - tree - vim -) - -case $HOSTNAME in - lj|li) : ;; - *) - # universal packages - # swh-plugins is for karaoke pulsaudio filter. - simple_packages+=( - apache2 - bwm-ng - chromium - duplicity - evince - fdupes - filelight - gdb - goaccess - gnome-screenshot - jq - locate - meld - nmap - offlineimap - p7zip - paprefs - pavucontrol - pdfgrep - pianobar - pidgin - slock - squashfs-tools - swh-plugins - tcpdump - transmission-remote-gtk - vlc - ) - ;; -esac - - +if isdeb; then + pi aptitude +fi ########### begin section including li ################ +pi ${p3[@]} $($src/distro-pkgs) +conflink case $distro in - debian) - if [[ `debian-archive` == testing ]]; then - pi acme-tiny - fi + arch) sgo cronie ;; esac case $distro in - fedora) spa unrar ;; - *) spa unrar-free ;; + arch) sgo atd ;; esac case $distro in - arch) - # ubuntu 14.04 uses b-cron, - # but its 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. + arch) sgo ntpd ;; esac +# no equivalent in other distros: case $distro in - debian|ubuntu) - pi debian-goodies - ;; + debian|trisquel|ubuntu) + if ! dpkg -s apt-file &>/dev/null; then + # this condition is just a speed optimization + pi apt-file + s apt-file update + fi + ;; esac +# disable motd junk. case $distro in - *) pi at ;;& - arch) sgo atd ;; + 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 + # stretch doesn't have initscripts pkg installed by default + if [[ $(debian-codename) == jessie ]]; then + s update-rc.d motd disable + fi + ;; + trisquel|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 + setup-debian-auto-update +fi + + +### begin docker install #### +if isdeb; then + # https://store.docker.com/editions/community/docker-ce-server-debian?tab=description + pi software-properties-common apt-transport-https + curl -fsSL https://download.docker.com/linux/$(distro-name-compat)/gpg | sudo apt-key add - + sudo add-apt-repository \ + "deb [arch=amd64] https://download.docker.com/linux/$(distro-name-compat) \ + $(debian-codename-compat) \ + stable" + p update + # docker eats up a fair amount of cpu when doing nothing, so don't enable it unless + # we really need it. + pi-nostart docker-ce + case $HOSTNAME in + li|lj) sgo docker ;; + esac + # other distros unknown +fi +### end docker install #### -case $distro in - debian) pi curl;; - arch) : ;; - # fedora: unknown -esac +### begin certbot install ### case $distro in - # tk for gitk - arch) spa git tk ;; - *) spa git ;; + debian) + # note, need python-certbot-nginx for nginx, but it depends on nginx, + # and I'm not installing nginx by default right now. + # note python-certbot-apache is in suggests, but so is a doc package that brought in xorg + if [[ $(debian-codename) == jessie ]]; then + pi -t jessie-backports certbot python-certbot-apache + else + pi certbot python-certbot-apache + fi + ;; + trisquel|ubuntu) + # not packaged in xenial or flidas + pi software-properties-common + s add-apt-repository -y ppa:certbot/certbot ||: + p update + pi python-certbot-apache + ;; + # todo: other distros unknown esac +# make a version of the certbot timer that emails me. +x=/systemd/system/certbot +$sed -r -f - /lib$x.timer <<'EOF' |s dd of=/etc${x}mail.timer +s,^Description.*,\0 mail version, +EOF +$sed -r -f - /lib$x.service <<'EOF' |s dd of=/etc${x}mail.service +s,(ExecStart=)(/usr/bin/certbot),\1/a/bin/log-quiet/sysd-mail-once certbotmail \2 --renew-hook /a/bin/distro-setup/certbot-renew-hook, +EOF +ser daemon-reload +sgo certbotmail.timer +### end certbot install ### -case $distro in - arch) spa the_silver_searcher ;; - debian|ubuntu) spa silversearcher-ag ;; - # fedora unknown + +# dogcam setup +case $HOSTNAME in + lj|li) + /a/bin/webcam/install-server + ;; + kw) + /a/bin/webcam/install-client + ;; esac -case $distro in - debian|ubuntu) spa ntp;; - arch) - pi ntp - sgo ntpd - ;; - # others unknown +# website setup +case $HOSTNAME in + lj|li) + case $HOSTNAME in + lj) domain=iank.bid; exit 0 ;; + li) domain=iankelling.org ;; + esac + /a/h/setup.sh $domain + /a/h/build.rb + + sudo -E /a/bin/mediawiki-setup/mw-setup-script + + pi-nostart mumble-server + s $sed -ri "s/^ *(serverpassword=).*/\1$(< /a/bin/bash_unpublished/mumble_pass)/" /etc/mumble-server.ini + + # do certificate to avoid warning about unsigned cert, + # which is overkill for my use, but hey, I'm cool, I know + # how to do this. + web-conf apache2 mumble.iankelling.org + s rm -f /etc/apache2/sites-enabled/mumble.iankelling.org + sudo -i <<'EOF' +export RENEWED_LINEAGE=/etc/letsencrypt/live/mumble.iankelling.org +/a/bin/distro-setup/certbot-renew-hook +EOF + + sgo mumble-server + + vpn-server-setup -rd + s tee /etc/openvpn/client-config/mail <<'EOF' +ifconfig-push 10.8.0.4 255.255.255.0 +EOF + + # it\'s strange. docker seems to make the default for forward + # be drop, but then I set it to accept and it\'s stuck that way, + # I dun know why. But, let\'s make sure we can forward anyways. + s DEBIAN_FRONTEND=noninteractive pi iptables-persistent + rm /etc/iptables/rules.v6 + s tee /etc/iptables/rules.v4 <<'EOF' +*filter +-A FORWARD -i tun+ -o eth0 -j ACCEPT +-A FORWARD -i eth0 -o tun+ -j ACCEPT +COMMIT +EOF + + + sudo dd of=/etc/systemd/system/vpnmail.service < + 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 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/privkey.pem", + "cert": "/home/pumpio/fullchain.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 + + # stretch node is too old + # https://nodejs.org/en/download/package-manager/ + curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash - + pi nodejs graphicsmagick mongodb + cd /home/iank + if [[ -e pump.io ]]; then + cd pump.io + git pull + else + git clone https://github.com/pump-io/pump.io.git + cd pump.io + fi + # note: these 2 commands seem + # 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 odb + # but it\'s this until a bug in pump gets fixed + # https://github.com/pump-io/pump.io/issues/1287 + s npm install -g databank-mongodb@0.19.2 + if ! getent passwd pumpio &>/dev/null; then + s useradd -Um -s /bin/false pumpio + fi + 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 + + s mkdir -p /var/log/pumpio/ + s chown pumpio:pumpio /var/log/pumpio/ + + web-conf - apache2 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/ + +EOF + + sudo -i <<'EOF' +export RENEWED_LINEAGE=/etc/letsencrypt/live/pump.iankelling.org +/a/bin/distro-setup/certbot-renew-hook +EOF + + s dd of=/etc/systemd/system/pump.service <<'EOF' +[Unit] +Description=pump.io +After=syslog.target network.target mongodb.service +Requires=mongodb.service + +[Service] +Type=simple +User=pumpio +Group=pumpio +ExecStart=/home/iank/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 + +[Install] +WantedBy=multi-user.target +EOF + ser daemon-reload + sgo pump + ########## end pump.io setup ############ + + + ############# begin setup mastodon ############## + + # main doc is Docker-Guide.md in docs repo + + # I'd like to try gnu social just cuz of gnu, but it's not being + # well maintained, for example, simple pull requests + # languishing: + # https://git.gnu.io/gnu/gnu-social/merge_requests/143 + # and I submitted my own bugs, basic docs are broken + # https://git.gnu.io/gnu/gnu-social/issues/269 + + # note, docker required, but we installed it earlier + + # i subscrubed to https://github.com/docker/compose/releases.atom + # to see release notes. + # i had some problems upgrading. blew things away with + # docker-compose down + # docker rmi $(docker images -q) + # s reboot now + # when running docker-compose run, kernel stack traces are printed to the journal. + # things seem to succeed, google says nothing, so ignoring them. + curl -L https://github.com/docker/compose/releases/download/1.18.0/docker-compose-`uname -s`-`uname -m` | s dd of=/usr/local/bin/docker-compose + s chmod +x /usr/local/bin/docker-compose + + + cd ~ + s rm -rf mastodon + i clone https://github.com/tootsuite/mastodon + cd mastodon + # subbed to atom feed to deal with updates + git checkout $(git tag | grep -v rc | tail -n1) + + # 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=mail.iankelling.org +SMTP_PORT=25 +SMTP_LOGIN=li +SMTP_FROM_ADDRESS=notifications@mast.iankelling.org +SMTP_DOMAIN=mast.iankelling.org +SMTP_DELIVERY_METHOD=smtp +EOF + + for key in PAPERCLIP_SECRET SECRET_KEY_BASE OTP_SECRET; do + # 1 minute 7 seconds to run this docker command + # to generate a secret, and it has ^M chars at the end. wtf. really dumb + printf "%s=%s\n" $key "$(docker-compose run --rm web rake secret|dos2unix|tail -n1)" >>.env.production + done + found=false + while read -r domain port pass; do + if [[ $domain == mail.iankelling.org ]]; then + found=true + # remove the username part + pass="${pass#*:}" + printf "SMTP_PASSWORD=%s\n" "$pass" >>.env.production + break + fi + done < <(s cat /etc/mailpass) + if ! $found; then + echo "$0: error, failed to find mailpass domain for mastadon" + exit 1 + fi + + # docker compose makes an interface named like br-8f3e208558f2. we need mail to + # get routed to us. + if ! s /sbin/iptables -t nat -C PREROUTING -i br-+ -p tcp -m tcp --dport 25 -j DNAT --to-destination 10.8.0.4:25; then + s /sbin/iptables -t nat -A PREROUTING -i br-+ -p tcp -m tcp --dport 25 -j DNAT --to-destination 10.8.0.4:25 + fi + + docker-compose run --rm web rake mastodon:webpush:generate_vapid_key | grep -E '^VAPID_PUBLIC_KEY=|^VAPID_PRIVATE_KEY=' >> .env.production + logq docker-compose run --rm web rake db:migrate + docker-compose run --rm web rails assets:precompile + + # avatar failed to upload, did + # docker logs mastodon_web_1 + # google lead me to this + s chown -R 991:991 public/system + + # docker daemon takes care of starting on boot. + docker-compose up -d + + s a2enmod proxy_wstunnel headers + web-conf -f 3000 - apache2 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 + + + ############### !!!!!!!!!!!!!!!!! + ############### manual steps: + + # only following a few 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 ############## + + # we use nsupdate to update the ip of home + pi bind9 + + pi znc + # 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 + # to get into the web interface, + # cat /etc/letsencrypt/live/iankelling.org/{privkey,cert,chain}.pem > /var/lib/znc/znc.pem + # then use non-main browser or else it doesn't allow it based on ocsp stapling from my main site. + # https://iankelling.org:12533/ + # i'm going to figure out how to automate this when it expires. i know i can hook a script into the renewal. https://wiki.znc.in/FAQ seems to imply that znc doesn\'t need restart. + # 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 + + echo "$0: $(date): ending now)" + exit 0 + ;; esac +########### end section including li/lj ############### + +pi ${p4[@]} $(apt-cache search ruby[.0-9]+-doc| awk '{print $1}') + -# no equivalent in other distros: case $distro in - debian|ubuntu) - pi apt-file aptitude - s apt-file update - # for debconf-get-selections - spa debconf-utils - ;; + trisquel|ubuntu) + l="deb http://ppa.launchpad.net/ansible/ansible/ubuntu xenial main" + f=/etc/apt/sources.list.d/ansible-ubuntu-ansible-xenial.list + if ! grep -qF "$l" $f; then + s add-apt-repository -y ppa:ansible/ansible + p update + fi + s pip install --upgrade pip + # newer 2.7 versions have a bug that incorrectly detects trisquel version. fixed once 2.8 arrives + # in 2019 + pip install --user ansible=2.7.4 + #pi ansible + ;; esac + + + case $distro in - ubuntu|debian) spa ack-grep ;; - arch|fedora) spa ack ;; - # fedora unknown + debian) + pi chromium ;; + trisquel|ubuntu) + wget -qO - https://downloads.iridiumbrowser.de/ubuntu/iridium-release-sign-01.pub|sudo apt-key add - + cat </dev/null < '127.0.0.1,192.168.1.*', +'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" => 700, +"speed-limit-up" => 800, "speed-limit-up-enabled" => true, -"ratio-limit" => 1.4000, +"peer-port" => 61486, +"cache-size-mb" => 256, +"ratio-limit" => 5.0, "ratio-limit-enabled" => true, })) + "\n") EOF - sgo transmission-daemon - ;; - arch) - # todo, setup it's config file & daemon - pi transmission-cli - ;; - esac -fi + # make sure its not enabled, not sure if this is needed + ser disable transmission-daemon + ;; + # todo: others unknown +esac # 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 + 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 +# 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 + +# trisquel 8 = openvpn, debian stretch = openvpn-client +vpn_ser=openvpn-client +if [[ ! -e /lib/systemd/system/openvpn-client@.service ]]; then + vpn_ser=openvpn +fi + +s dd of=/etc/systemd/system/transmission-daemon-nn.service </dev/null; 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) : ;; + li|lj) s rm -rf /home/linode ;; esac +### printer setup 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 - - -case $distro in - arch) spa ttf-dejavu;; - debian|ubuntu) spa fonts-dejavu ;; - # others unknown + 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 + ;; + debian|trisquel|ubuntu) + pi cups + s gpasswd -a $USER lpadmin # based on ubuntu wiki + spa hplip + ;; + # other distros unknown esac +# 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 -# bridge networking as user fails. google lead here, but it doesn't work: +for x in iank traci; 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 @@ -578,126 +1261,52 @@ for x in ian traci; do s usermod -a -G libvirt,kvm $x; done # #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 - 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 --follow-symlinks '/^ *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-adb/unstable ;; - arch) spa android-tools ;; - # other distros unknown -esac - -case $distro in - debian) - if [[ `debian-archive` == testing ]]; then - # has no unstable dependencies - spa bitcoin-qt/unstable - fi - ;; - # other distros unknown + debian|trisquel|ubuntu) + # a bit of googling, and added settings to bashrc + go get -u github.com/mvdan/fdroidcl/cmd/fdroidcl + ;; esac - -# proprietary flash. going without for now -# case $distro in -# debian) -# pi flashplugin-nonfree -# esac - - - 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 - ;;& - arch) - pi python2-pygments - ;; - debian|ubuntu) - pi python-pygments - ;; + arch) + # 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 - debian) - pi task-cinnamon-desktop - # in settings, change scrolling to two-finger, - # because the default edge scroll doesn\'t work. - pu transmission-gtk - ;; - # others unknown -esac - -case $distro in - arch) spa apg ;; - - # already in debian jessie + 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 + s pip install pygments + ;; + *) + pi global + ;;& + arch) + pi python2-pygments + ;; + debian|trisquel|ubuntu) + pi python-pygments + ;; esac @@ -709,87 +1318,120 @@ esac # Trying to run as user instance, but $XDG_RUNTIME_DIR is not set if isdebian-testing; then - # as of 7/2016, has no unstable deps, and is not in testing anymore. - pi synergy/unstable + # as of 7/2016, has no unstable deps, and is not in testing anymore. + pi synergy/unstable else - pi synergy + pi synergy fi -case $distro in - # ubuntu unknown. probably the same as debian, just check if the - # init scripts come with the package. - debian) - # copied from arch, but moved to etc - s dd of=/etc/systemd/user/synergys.service <<'EOF' -[Unit] -Description=Synergy Server Daemon -After=network.target - -[Service] -User=%i -ExecStart=/usr/bin/synergys --no-daemon --config /etc/synergy.conf -Restart=on-failure - -[Install] -WantedBy=multi-user.target -EOF - s dd of=/etc/systemd/user/synergys.socket <<'EOF' -[Unit] -Conflicts=synergys@.service +# case $distro in +# # ubuntu unknown. probably the same as debian, just check if the +# # init scripts come with the package. +# debian) +# # copied from arch, but moved to etc +# s dd of=/etc/systemd/user/synergys.service <<'EOF' +# [Unit] +# Description=Synergy Server Daemon +# After=network.target + +# [Service] +# User=%i +# ExecStart=/usr/bin/synergys --no-daemon --config /etc/synergy.conf +# Restart=on-failure + +# [Install] +# WantedBy=multi-user.target +# EOF +# s dd of=/etc/systemd/user/synergys.socket <<'EOF' +# [Unit] +# Conflicts=synergys@.service -[Socket] -ListenStream=24800 -Accept=false +# [Socket] +# ListenStream=24800 +# Accept=false -[Install] -WantedBy=sockets.target -EOF - # had this fail with 'Failed to connect to bus: No such file or directory' - # then when I tried it manually, it worked fine... - if ! systemctl --user daemon-reload; then - sleep 2 - echo retrying systemd user daemon reload - systemctl --user daemon-reload - fi - ;;& - *) - # taken from arch wiki. - s dd of=/etc/systemd/system/synergyc@.service <<'EOF' -[Unit] -Description=Synergy Client -After=network.target +# [Install] +# WantedBy=sockets.target +# EOF +# # had this fail with 'Failed to connect to bus: No such file or directory' +# # then when I tried it manually, it worked fine... +# if ! systemctl --user daemon-reload; then +# sleep 2 +# echo retrying systemd user daemon reload +# systemctl --user daemon-reload +# fi +# ;;& +# *) +# # taken from arch wiki. +# s dd of=/etc/systemd/system/synergyc@.service <<'EOF' +# [Unit] +# Description=Synergy Client +# After=network.target + +# [Service] +# User=%i +# ExecStart=/usr/bin/synergyc --no-daemon frodo +# Restart=on-failure +# # per man systemd.unit, StartLimitInterval, by default we +# # restart more than 5 times in 10 seconds. +# # And this param defaults too 200 miliseconds. +# RestartSec=3s + +# [Install] +# WantedBy=multi-user.target +# EOF +# s systemctl daemon-reload +# case $HOSTNAME in +# x2|x3|tp) +# ser enable synergyc@iank +# ser start synergyc@iank ||: # X might not be running yet +# ;; +# frodo) +# systemctl --user start synergys ||: +# systemctl --user enable synergys +# ;; +# esac +# ;; +# esac -[Service] -User=%i -ExecStart=/usr/bin/synergyc --no-daemon frodo -Restart=on-failure -# per man systemd.unit, StartLimitInterval, by default we -# restart more than 5 times in 10 seconds. -# And this param defaults too 200 miliseconds. -RestartSec=3s -[Install] -WantedBy=multi-user.target -EOF - s systemctl daemon-reload - case $HOSTNAME in - x2|treetowl) - ser enable synergyc@ian - ser start synergyc@ian ||: # X might not be running yet - ;; - frodo) - systemctl --user start synergys ||: - systemctl --user enable synergys - ;; - esac - ;; +pi --no-install-recommends kdeconnect-plasma +### 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 + 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 +# 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 @@ -829,6 +1471,48 @@ DEVICESCAN -a -o on -S on -n standby,q $sched \ ########### misc stuff +# 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 + + +# 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 fi 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 < x.html EOF -if [[ $HOSTNAME == treetowl ]] && ! sudo test -e /etc/openvpn/client.key; then - /a/bin/vpn-setup/vpn-mk-client-cert dopub -fi - - 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=unstable -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 - ;; + 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 case $distro in - arch) - # default is alsa, doesn\'t work with with pianobar - s dd of=/etc/libao.conf <<'EOF' + arch) + # default is alsa, doesn\'t work with with pianobar + s dd of=/etc/libao.conf <<'EOF' default_driver=pulse EOF - ;; + ;; esac -# not using it atm, and for jessie, it depends on a higher version of btrfs-tools +# 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 ;; +# arch|debian|trisquel|ubuntu) pi btrbk ;; # # others unknown # esac +cd /a/opt/btrbk +s make install -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 - - +# ian: temporarily disabled while hosts are in flux. +# if [[ $HOSTNAME == tp ]]; then +# # backup/sync manually on others hosts for now. +# sgo btrbk.timer +# # note: to see when it was last run, +# # ser list-timers +# fi +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 - # 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 @@ -933,35 +1615,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 - ;; - 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 + # to be secure, take a look at the fingerprint reported from the following install, and see if it matches from the link above: + # 3B9E EEB9 7B1E 827B CF0A 0D96 8AF5 653C 5AC0 01F1 + sgo tor + /a/bin/buildscripts/tor-browser + ;; + ubuntu) + tu /etc/apt/sources.list "deb http://deb.torproject.org/torproject.org $(debian-codename) main" + gpg --keyserver keys.gnupg.net --recv 886DDD89 + gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add - + p update + pi deb.torproject.org-keyring + pi tor + /a/bin/buildscripts/tor-browser + ;; + debian) + pi tor + /a/bin/buildscripts/tor-browser + ;; + arch) + pi tor tor-browser-en + sgo tor + ;; + # ubuntu unknown esac # nfs server case $distro in - fedora) - end_msg <<'EOF' + fedora) + 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 @@ -978,180 +1660,64 @@ 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 || pending_reboot=true - sgo rpcbind - # this failed until I rebooted - sgo nfs-server - ;; -esac - -if [[ $HOSTNAME == treetowl ]]; 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 192.168.1.0/24(rw,fsid=0,nohide,no_root_squash,async,no_subtree_check,insecure) -EOF - s exportfs -rav -fi - - -e "$end_msg_var" - - -# persistent virtual machines - -case $distro in - debian|ubuntu) - pi libosinfo-bin; - ;; + pi nfs-utils + sgo nfs-server + ;; + debian|trisquel|ubuntu) + pi nfs-server + ;; + arch) + pi nfs-utils || pending_reboot=true + sgo rpcbind + # this failed until I rebooted + sgo nfs-server + ;; 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 - -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 - -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 -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 - - # 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 +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)" - - - -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 -fi +e "$end_msg_var" -######### 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 -) +# 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 -case $distro in - ubuntu|debian) - spa spacefm-gtk3 ;; - arch) - spa spacefm ;; -esac -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 + echo "$0: pending reboot and then finished. doing it now." + s reboot now else - echo "$0: $(date): ending now)" + echo "$0: $(date): ending now)" fi +exit 0