X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=distro-end;h=61008fa66a44452ab84279cb2936e83463b586d0;hb=5fc2a328a44bd7aac3110e7d9c49eaa3e0db8aaf;hp=1b25a55eced2a26e3dd6e5a74903af810ca14adf;hpb=25d20d07292550e8701e33aa409e4947f3075ede;p=distro-setup
diff --git a/distro-end b/distro-end
index 1b25a55..61008fa 100755
--- a/distro-end
+++ b/distro-end
@@ -1,21 +1,21 @@
#!/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
+}
-### setup
-source /a/bin/errhandle/err
-src="${BASH_SOURCE%/*}"
+# shellcheck source=./pkgs
source $src/pkgs
set -x
@@ -27,10 +27,26 @@ end_msg() {
IFS= read -r -d '' y ||:
end_msg_var+="$y"
}
+end() {
+ e "$end_msg_var"
+ echo 0 >~/.local/distro-end
+ if $pending_reboot; then
+ echo "$0: pending reboot and then finished. doing it now."
+ s reboot now
+ else
+ echo "$0: $(date): ending now)"
+ fi
+ exit 0
+}
+die() {
+ printf "$0: %s\n" "$*" >&2; exit 1
+}
spa() { # simple package add
simple_packages+=($@)
}
distro=$(distro-name)
+codename=$(debian-codename)
+codename_compat=$(debian-codename-compat)
pending_reboot=false
sed="sed --follow-symlinks"
# template
@@ -43,35 +59,25 @@ if isdeb; then
pi aptitude
fi
-########### begin section including li ################
-pi ${p3[@]} $($src/distro-pkgs)
+# avoid prompts
+s debconf-set-selections </dev/null; then
- # this condition is just a speed optimization
- pi apt-file
- s apt-file update
- fi
- ;;
-esac
+if isdeb && pcheck apt-file; then
+ # this condition is just a speed optimization
+ pi apt-file
+ s apt-file update
+fi
+
# disable motd junk.
case $distro in
@@ -82,79 +88,34 @@ case $distro in
# 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
+ s rm -f /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 -
- url=https://download.docker.com/linux/$(distro-name-compat)
- l="deb [arch=amd64] $url $(debian-codename-compat) stable"
+### begin certbot install ###
+if [[ $distro == debian ]]; then
+ # note, need python-certbot-nginx for nginx, but it depends on nginx,
+ # and I'm not installing nginx by default right now.
+ pi certbot python-certbot-apache
+elif [[ $codename_compat == xenial ]]; then
+ # not packaged in xenial or flidas
+ pi software-properties-common
+ l="deb http://ppa.launchpad.net/certbot/certbot/ubuntu xenial main"
if ! grep -xFq "$l" /etc/apt/sources.list{,.d/*.list}; then
- sudo add-apt-repository "$l"
+ s add-apt-repository -y ppa:certbot/certbot ||:
p update
fi
- # 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
- # and docker is even more crap, it ignores that it shouldnt start
- ser stop docker
- ser disable docker
- case $HOSTNAME in
- li|lj) sgo docker ;;
- esac
- # other distros unknown
+ pi python-certbot-apache
+else
+ die "distro unknown for certbot"
fi
-### end docker install ####
-
-
-### begin certbot install ###
-case $distro in
- 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
- l="deb http://ppa.launchpad.net/certbot/certbot/ubuntu xenial main"
- if ! grep -xFq "$l" /etc/apt/sources.list{,.d/*.list}; then
- s add-apt-repository -y ppa:certbot/certbot ||:
- p update
- fi
- 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
@@ -178,20 +139,283 @@ sgo certbotmail.timer
# ;;
# esac
-pi ${p1[@]}
-# website setup
+## not actually using prometheus just yet
+# # office is not exposed to internet yet
+# if [[ $HOSTNAME != kw ]]; then
+# ## prometheus node exporter setup
+# web-conf -f 9100 -p 9101 apache2 $(hostname -f) <<'EOF'
+# #https://httpd.apache.org/docs/2.4/mod/mod_authn_core.html#authtype
+# # https://stackoverflow.com/questions/5011102/apache-reverse-proxy-with-basic-authentication
+#
+# 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 <$t <$t <$t <
- Options +FollowSymLinks +Multiviews +Indexes
- AllowOverride None
- AuthType basic
- AuthName "Authentication Required"
- # setup one time, with root:www-data, 640
- AuthUserFile "/etc/caldav-htpasswd"
- Require valid-user
-
+
+ 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
+ ###### 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/pump.iankelling.org
+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'
-[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
@@ -531,11 +522,6 @@ EOF
# 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
@@ -548,12 +534,12 @@ EOF
# on killing the,
# an example seems to be here: https://github.com/zenspider/elisp/blob/master/rwd-irc.el
# if that was the case i could remove the module clearbufferonmsg
- # alo would be nice if erc supported
+ # also would be nice if erc supported
# https://wiki.znc.in/self-message
# https://wiki.znc.in/Query_buffers \
#
s useradd --create-home -d /var/lib/znc --system --shell /sbin/nologin --comment "Account to run ZNC daemon" --user-group znc || [[ $? == 9 ]] # 9 if it exists already
- chmod 700 /var/lib/znc
+ s chmod 700 /var/lib/znc
s chown -R znc:znc /var/lib/znc
s dd of=/etc/systemd/system/znc.service 2>/dev/null <<'EOF'
[Unit]
@@ -569,48 +555,67 @@ WantedBy=multi-user.target
EOF
ser daemon-reload
sgo znc
+ ###### stop znc setup #####
- echo "$0: $(date): ending now)"
- exit 0
+ end
;;
esac
+###### end website setup
########### end section including li/lj ###############
-# 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}')
+#### 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
-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
-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 <$t </dev/null <$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
+ 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
@@ -1119,56 +1038,54 @@ fi
# 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'
+# note i had to do this, which is persistent:
+# cd /i/k
+# s chgrp debian-transmission torrents partial-torrents
+
+# syslog says things like
+# 'Failed to set receive buffer: requested 4194304, got 425984'
+# google suggets giving it even more than that
+tu /etc/sysctl.conf<<'EOF'
net.core.rmem_max = 67108864
net.core.wmem_max = 16777216
EOF
- s sysctl -p
-
- # some reason it doesn\'t seem to start automatically anyways
- pi-nostart transmission-daemon
- # be extra sure its not started
- ser disable transmission-daemon
- ser stop transmission-daemon
-
- # the folder was moved here after an install around 02/2017.
- # it contains runtime data,
- # plus a simple symlink to the config file which it\'s
- # not worth separating out.
- # between comps, the uid can change
- f=/i/transmission-daemon
- s lnf -T $f /var/lib/transmission-daemon/.config/transmission-daemon
- if [[ -e $f ]]; then
- s chown -R debian-transmission:debian-transmission $f
- fi
- for f in /i/k/partial-torrents /i/k/torrents; do
- if [[ -e $f ]]; then
- s chown -R debian-transmission:traci $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'
+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({
@@ -1185,10 +1102,7 @@ File.write(p, JSON.pretty_generate(JSON.parse(File.read(p)).merge({
"ratio-limit-enabled" => true,
})) + "\n")
EOF
-
- ;;
- # todo: others unknown
-esac
+####### end transmission
@@ -1253,8 +1167,11 @@ EOF
rpc_pass=$(
/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)
- # 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
- 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
-
-
-
-
-# note this failed running at the beginning of this file,
-# because no systemd user instance was running.
-# Doing systemd --user resulted in
-# 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
-else
- 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
+/a/bin/buildscripts/go
-# [Socket]
-# ListenStream=24800
-# Accept=false
+pi-nostart virtinst virt-manager
-# [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
-pi --no-install-recommends kdeconnect-plasma
+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
+# 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 ###
@@ -1494,11 +1259,6 @@ sudo make install
# 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.
@@ -1577,8 +1337,8 @@ 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),)
+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 < x.html
-EOF
-
-
-case $distro in
- 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'
-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|trisquel|ubuntu) pi btrbk ;;
-# # others unknown
-# esac
+# aren't autoupdating this, but I do check on it somewhat regularly.
cd /a/opt/btrbk
s make install
-# 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
+sgo btrbk.timer
+# note: to see when it was last run,
+# ser list-timers
end_msg <<'EOF'
@@ -1664,95 +1371,33 @@ case $distro in
esac
-case $distro in
- debian|trisquel|ubuntu) s gpasswd -a iank adm ;; #needed for reading logs
-esac
+s gpasswd -a iank adm ;; #needed for reading logs
/a/bin/buildscripts/pithosfly
-#### tor
-case $distro in
- # based on
- # https://www.torproject.org/docs/rpms.html.en
- # https://www.torproject.org/docs/debian.html.en
- # todo: figure out if the running service needs to be restarted upon updates
- # todo on fedora: setup non-dev packages
- fedora)
- s dd of=/etc/yum.repos.d/torproject.repo <<'EOF'
-[tor]
-name=Tor experimental repo
-enabled=1
-baseurl=http://deb.torproject.org/torproject.org/rpm/tor-testing/fc/20/$basearch/
-gpgcheck=1
-gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.asc
-
-[tor-source]
-name=Tor experimental source repo
-enabled=1
-autorefresh=0
-baseurl=http://deb.torproject.org/torproject.org/rpm/tor-testing/fc/20/SRPMS
-gpgcheck=1
-gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.asc
-EOF
- # to be secure, take a look at the fingerprint reported from the following install, and see if it matches from the link above:
- # 3B9E EEB9 7B1E 827B CF0A 0D96 8AF5 653C 5AC0 01F1
- sgo tor
- /a/bin/buildscripts/tor-browser
- ;;
- 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
+# # 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
-# nfs server
-case $distro in
- fedora)
- end_msg <<'EOF'
-fedora todo: disable the firewall or find a way to automate it.
-there's an unused section in t.org for tramikssion firewall setup
-
-fedora manual config for nfs:
-s firewall-config
-change to permanent configuration
-check the box for nfs
-was hard to figure this out, not sure if this is all needed, but
-unblock these too
-mountd: udp/tcp 20048
-portmapper, in firewall-config its called rpc-bind: udp/tcp 111
-troubleshooting, unblock things in rpcinfo -p
-make sure to reload the firewall to load the persistent configuration
-EOF
- pi nfs-utils
- sgo nfs-server
- ;;
- debian|trisquel|ubuntu)
- pi nfs-server
- ;;
- arch)
- pi nfs-utils || pending_reboot=true
- sgo rpcbind
- # this failed until I rebooted
- sgo nfs-server
- ;;
-esac
+pi tor
+/a/bin/buildscripts/tor-browser
+
+# nfs server
+pi-nostart nfs-server
# networkmanager has this nasty behavior on flidas: if the machine
# crashes with dnsmasq running, on subsequent boot, it adds an entry to
@@ -1779,7 +1424,6 @@ EOF
fi
-e "$end_msg_var"
@@ -1793,11 +1437,4 @@ e "$end_msg_var"
######### 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
-exit 0
+end