X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;ds=inline;f=distro-end;h=6c0f446642d15916512a929ce22caad4ef9a71f2;hb=f5bedaabc8ab8e0fa29238b70ab66bd7d37095d1;hp=534c17a5856691b20dc07bad6ddee92cb7fe667a;hpb=4f1b3daa120bbbf886af22bf15ee8b65b13d0eb8;p=distro-setup
diff --git a/distro-end b/distro-end
index 534c17a..6c0f446 100755
--- a/distro-end
+++ b/distro-end
@@ -1,287 +1,452 @@
#!/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
+if [[ $EUID == 0 ]]; then
+ echo "$0: error: run as regular user" >&2
+ exit 1
+fi
-# 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.
+_errcatch_cleanup() {
+ echo 1 >~/.local/distro-end
+}
-errcatch
+# shellcheck source=./pkgs
+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"
+}
+die() {
+ printf "$0: %s\n" "$*" >&2; exit 1
}
-
spa() { # simple package add
- simple_packages+=($@)
+ simple_packages+=($@)
}
-
distro=$(distro-name)
-
+codename=$(debian-codename)
+codename_compat=$(debian-codename-compat)
pending_reboot=false
sed="sed --follow-symlinks"
-
# template
case $distro in
esac
+#### initial packages
pup
+if isdeb; then
+ pi aptitude
+fi
-simple_packages=(
- htop
- mailutils
- nmon
- rdiff-backup
- ruby
- ruby-rest-client
- tree
- vim
- wcd
-)
-
-case $HOSTNAME in
- lj|li) : ;;
- *)
- # universal packages
- # swh-plugins is for karaoke pulsaudio filter.
- # mutagen for pithos
- simple_packages+=(
- apache2
- apache2-doc
- apt-doc
- aptitude-doc-en
- bash-doc
- binutils-doc
- bwm-ng
- chromium
- cpio-doc
- cron
- debconf-doc
- duplicity
- eclipse
- evince
- fdupes
- feh
- filelight
- gawk-doc
- gcc-doc
- gdb
- gdb-doc
- git-doc
- gitk
- glibc-doc
- goaccess
- gnome-screenshot
- i3lock
- iproute2-doc
- jq
- linux-doc
- locate
- make-doc
- manpages
- manpages-dev
- meld
- mumble
- nmap
- offlineimap
- p7zip
- paprefs
- parted-doc
- pavucontrol
- pdfgrep
- perl-doc
- pianobar
- pidgin
- python3-doc
- python3-mutagen
- reportbug
- sqlite3-doc
- squashfs-tools
- swh-plugins
- tar-doc
- tcpdump
- transmission-remote-gtk
- vlc
- whois
- )
- spa $(apt-cache search ruby[.0-9]+-doc| awk '{print $1}')
- ;;
-esac
-
+# avoid prompts
+s debconf-set-selections <
+# AllowOverride None
+# AuthType basic
+# AuthName "Authentication Required"
+# # setup one time, with root:www-data, 640
+# AuthUserFile "/etc/prometheus-htpasswd"
+# Require valid-user
+#
+# EOF
+# fi
+
+
+######### begin flidas pinned packages ######
+case $(debian-codename) in
+ # needed for debootstrap scripts for fai since fai requires debian
+ flidas)
+ curl http://archive.ubuntu.com/ubuntu/project/ubuntu-archive-keyring.gpg | s apt-key add -
+ s dd of=/etc/apt/preferences.d/flidas-xenial </dev/null </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
+Package: *
+Pin: release a=bionic-security
+Pin-Priority: -100
+EOF
-case $distro in
- ubuntu|debian) spa ack-grep ;;
- arch|fedora) spa ack ;;
- # fedora unknown
-esac
+ # better to run btrfs-progs which matches our kernel version
+ # (note, renamed from btrfs-tools)
+ s dd of=/etc/apt/preferences.d/btrfs-progs <$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
+ sgo vpnmail.service
+ # needed for li's local mail delivery.
+ tu /etc/hosts <<<"10.8.0.4 mail.iankelling.org"
+ sgo $vpn_service
+ # setup let's encrypt cert
+ web-conf apache2 mail.iankelling.org
+ s rm /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 ############
+ ser daemon-reload
+ sgo znc
+ ###### stop znc setup #####
- echo "$0: $(date): ending now)"
- exit 0
- ;;
-esac
+ echo "$0: $(date): ending now)"
+ exit 0
+ ;;
+esac
+###### end website setup
+
########### end section including li/lj ###############
-# pump.io periodic backup
-if [[ $HOSTNAME == treetowl ]]; then
- s dd of=/etc/systemd/system/pumpbackup.service <<'EOF'
+#### desktop stuff
+case $codename_compat in
+ xenial)
+ # mate-indicator-applet and beyond are msc things I noticed diffing a
+ # standard install with mine.
+ pi xorg lightdm mate-desktop-environment mate-desktop-environment-extras mate-indicator-applet anacron
+ ;;
+ stretch)
+ pi task-mate-desktop
+ ;;
+ buster)
+ # mate doesnt have wayland support yet
+ pi task-gnome-desktop
+ ;;
+esac
+
+
+
+
+# TODO: some of the X programs can be removed from pall when using wayland
+
+# depends gcc is a way to install suggests. this is apparently the only
+# way to install suggests even if the main package is already
+# installed. reinstall doesn't work, uninstalling can cause removing
+# dependent packages.
+pi ${pall[@]} $(apt-cache search ruby[.0-9]+-doc| awk '{print $1}') $(apt-cache depends gcc|grep -i suggests:| awk '{print $2}') $($src/distro-pkgs)
+
+if ! type pip; then
+ x=$(mktemp)
+ wget -O$x https://bootstrap.pypa.io/get-pip.py
+ python3 $x --user
+fi
+
+sgo fsf-vpn-dns-cleanup
+
+
+# website is dead june 14 2019
+s rm -f /etc/apt/sources.list.d/iridium-browser.list
+# case $distro in
+# debian)
+# pi chromium ;;
+# trisquel|ubuntu)
+# wget -qO - https://downloads.iridiumbrowser.de/ubuntu/iridium-release-sign-01.pub|sudo apt-key add -
+# t=$(mktemp)
+# cat >$t < /dev/null; then
+ s groupadd -g 450 debian-transmission
+ case $distro in
+ arch)
+ s useradd \
+ --system \
+ --create-home \
+ --gid 450 \
+ --uid 450 \
+ --home-dir /var/lib/transmission-daemon \
+ --shell /bin/false \
+ debian-transmission
+ ;;
+ *)
+ s adduser --quiet \
+ --gid 450 \
+ --uid 450 \
+ --system \
+ --no-create-home \
+ --disabled-password \
+ --home /var/lib/transmission-daemon \
+ debian-transmission
+ ;;
+ esac
+fi
+# We want group writable stuff from transmission.
+# However, after setting this, I learn that transmission sets it's
+# own umask based on it's settings file. Well, no harm leaving this
+# so it's set right from the beginning.
+s chfn debian-transmission -o umask=0002
+
+case $distro in
+ debian|trisquel|ubuntu)
+ # note i had to do this, which is persistent:
+ # cd /i/k
+ # s chgrp debian-transmission torrents partial-torrents
+
+ # syslog says things like
+ # 'Failed to set receive buffer: requested 4194304, got 425984'
+ # google suggets giving it even more than that
+ tu /etc/sysctl.conf<<'EOF'
net.core.rmem_max = 67108864
net.core.wmem_max = 16777216
EOF
- s sysctl -p
-
- # some reason it doesn't seem to start automatically anyways
- pi-nostart transmission-daemon
-
- # 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({
@@ -631,72 +1151,85 @@ File.write(p, JSON.pretty_generate(JSON.parse(File.read(p)).merge({
})) + "\n")
EOF
- # make sure its not enabled, not sure if this is needed
- ser disable transmission-daemon
- sgo transmission-daemon-nn
- ;;
- # todo: others unknown
- esac
- fi
+ ;;
+ # 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
- 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
-# password
+# 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
+ 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 firefox pulseaudio;;
- *) : ;; # comes default or with other packages
-esac
-
-case $distro in
- arch) spa ttf-dejavu;;
- debian|ubuntu) spa fonts-dejavu ;;
- # others unknown
-esac
-
-
-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 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
@@ -865,312 +1297,112 @@ 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
+# general known for debian/ubuntu, not for fedora
case $distro in
- arch) spa cdrkit;;
- debian|ubuntu) spa genisoimage;;
- # others unknown
+ debian|trisquel|ubuntu)
+ if ! type -p go &>/dev/null; then
+ cd $(mktemp -d)
+ # just the latest stable at the time of writing
+ # TODO, maybe put this all into a build script,
+ # and do some automatic updates
+ wget -q https://dl.google.com/go/go1.12.4.linux-amd64.tar.gz
+ s tar -C /usr/local -xzf go1.12.4.linux-amd64.tar.gz
+ rm -f ./*
+ fi
+ go get -u mvdan.cc/fdroidcl
+ # a bit of googling, and added settings to bashrc
+ ;;
esac
case $distro in
- arch) spa spice-gtk3 ;;
- debian|ubuntu) spa spice-client-gtk;;
- # others unknown
-esac
-
-# general known for debian/ubuntu, not for fedora
+ arch)
+ pi virt-install
+ # otherwise we get error about accessing kvm module.
+ # seems like there might be a better way, but google was a bit vague.
+ s $sed -ri '/^ *user *=/d' /etc/libvirt/qemu.conf
+ echo 'user = "root"' | s tee -a /etc/libvirt/qemu.conf
+ # guessing this is not needed
+ #sgo virtlogd.service
+
+ # iank: disabed as im not using libvirt usually
+ # # https://bbs.archlinux.org/viewtopic.php?id=206206
+ # # # this should prolly go in the wiki
+ # sgo virtlogd.socket
+ # sgo libvirtd
+ ;;
+ debian|trisquel|ubuntu)
+ pi-nostart virtinst virt-manager
+ ;;
-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
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
-
- ;;
+ fedora)
+ cd $(mktemp -d)
+ wget ftp://ftp.gnu.org/pub/gnu/global/global-6.5.7.tar.gz
+ ex global*
+ cd global-6.5.7
+ # based on https://github.com/leoliu/ggtags
+ ./configure --with-exuberant-ctags=/usr/bin/ctags
+ make
+ s make install
+ pip install pygments
+ ;;
+ *)
+ pi global
+ ;;&
+ arch)
+ pi python2-pygments
+ ;;
+ debian|trisquel|ubuntu)
+ pi python-pygments
+ ;;
esac
-case $distro in
- arch) pi virtviewer ;;
- *) : ;; # other distros have it as a dependency afaik.
-esac
+# removed synergy since ive not used it in a long time
-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
+pi --no-install-recommends kdeconnect
+### kdeconnect for gnome. started in /a/bin/distro-setup/desktop-20-autostart.sh
+### but gnome + xmonad not working in flidas, so i disabled it
+# pi libgtk-3-dev python3-requests-oauthlib valac cmake python-nautilus libappindicator3-dev
+# cd /a/opt/indicator-kdeconnect
+# mkdir -p build
+# cd build
+# cmake .. -DCMAKE_INSTALL_PREFIX=/usr
+# make
+# sudo make install
+# # we can start it manually with /usr/lib/x86_64-linux-gnu/libexec/kdeconnectd
+# # it seems, according to
+# # /etc/xdg/autostart/kdeconnectd.desktop
+# # I'm not seeing the icon, but the clipboard replication is working
+### model 01 arduino support ###
+# https://github.com/keyboardio/Kaleidoscope/wiki/Install-Arduino-support-on-Linux
+# also built latest arduino in /a/opt/Arduino, (just cd build; ant build; ant run )
+# set arduino var in bashrc,
+# have system config file setup too.
+sudo adduser $USER dialout
case $distro in
- debian|ubuntu) spa android-tools-adbd/unstable ;;
- arch) spa android-tools ;;
- # other distros unknown
+ arch)
+ sudo usermod -a -G uucp $USER
+ ;;
esac
-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
- ;;
+ 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
-# 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
-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
-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
+sgo btrbk.timer
+# note: to see when it was last run,
+# ser list-timers
+end_msg <<'EOF'
+In mate settings settings, change scrolling to two-finger,
+because the default edge scroll doesn\'t work. Originally found this in debian.
+EOF
+case $distro in
+ debian)
+ # remove dep that came in with desktop
+ pu transmission-gtk
+ ;;
+esac
case $distro in
- debian|ubuntu) s gpasswd -a ian adm ;; #needed for reading logs
+ debian|trisquel|ubuntu) s gpasswd -a iank adm ;; #needed for reading logs
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
+/a/bin/buildscripts/pithosfly
+
+
+# based on guix manual instructions, also added code to profile
+pi nscd
+if ! type -p guix >/dev/null; then
+ cd $(mktemp -d)
+ wget https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh
+ # added some stuff to envonment.sh for profile based on
+ # manual instructions
+ # wget https://sv.gnu.org/people/viewgpg.php?user_id=15145 -qO - | gpg --import -
+ # echo is to get past prompt
+ yes | sudo -E HOME=$HOME bash guix-install.sh || [[ $? == 141 ]]
+ guix install glibc-utf8-locales
+ guix package --install guile
+fi
+# install rust.
+curl https://sh.rustup.rs -sSf | bash -s -- -y
+# todo: update this. updates in rust are stupidly complicate
+if ! which rg &>/dev/null; then
+ cargo install ripgrep
+fi
- # todo on fedora: setup non-dev packages
- fedora)
- s dd of=/etc/yum.repos.d/torproject.repo <<'EOF'
+#### tor
+case $distro in
+ # based on
+ # https://www.torproject.org/docs/rpms.html.en
+ # https://www.torproject.org/docs/debian.html.en
+ # todo: figure out if the running service needs to be restarted upon updates
+ # todo on fedora: setup non-dev packages
+ fedora)
+ s dd of=/etc/yum.repos.d/torproject.repo <<'EOF'
[tor]
name=Tor experimental repo
enabled=1
@@ -1335,35 +1590,35 @@ gpgcheck=1
gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.asc
EOF
- # to be secure, take a look at the fingerprint reported from the following install, and see if it matches from the link above:
- # 3B9E EEB9 7B1E 827B CF0A 0D96 8AF5 653C 5AC0 01F1
- sgo tor
- /a/bin/buildscripts/tor-browser
- ;;
- 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
@@ -1380,170 +1635,60 @@ make sure to reload the firewall to load the persistent configuration
EOF
- pi nfs-utils
- sgo nfs-server
- ;;
- debian|ubuntu)
- pi nfs-server
- ;;
- arch)
- pi nfs-utils || pending_reboot=true
- sgo rpcbind
- # this failed until I rebooted
- sgo nfs-server
- ;;
+ pi nfs-utils
+ ;;
+ debian|trisquel|ubuntu)
+ pi-nostart nfs-server
+ ;;
+ arch)
+ pi nfs-utils || pending_reboot=true
+ ;;
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)
+# networkmanager has this nasty behavior on flidas: if the machine
+# crashes with dnsmasq running, on subsequent boot, it adds an entry to
+# resolvconf for 127.0.0.1 in some stupid attempt to restore
+# nameservers.
+# This can be manually fixed by stoping dnsmasq,
+# then based on whats in /run/dnsmasq/, i see we can run
+# s resolvconf -d NetworkManager
+# oh ya, and stoping NetworkManager leaves this crap behind without cleaning it up.
+ser stop NetworkManager
+ser disable NetworkManager
+
+
+if [[ $HOSTNAME == frodo ]]; then
+ # nohide = export filesystems mounted deeper than the export point
+ # fsid=0 makes this export the "root" export
+ # not documented in the man page, but this means
+ # 1. it can be mounted with a shorthand of server:/
+ # 2. exports that are subdirectories of this one will automatically be mounted
+ tu /etc/exports <<'EOF'
+/k 10.0.0.0/24(rw,fsid=0,nohide,no_root_squash,async,no_subtree_check,insecure)
EOF
- s exportfs -rav
+ s exportfs -rav
fi
e "$end_msg_var"
-# 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
-
-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
-
- 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 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
-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
-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
-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
-
-
-pi "${simple_packages[@]}"
-
-
+echo 0 >~/.local/distro-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