X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=distro-end;h=84566b89fa4299468c147d69bd2e60ee97911166;hb=28904b44d0dd6ce9d43ab720b5efe9af2ce336de;hp=f9439102dac184f0b648a114f5b50c038c7542d1;hpb=3a5055dce8796a1946d9f75d8c74605eb73d19df;p=distro-setup diff --git a/distro-end b/distro-end index f943910..84566b8 100755 --- a/distro-end +++ b/distro-end @@ -13,356 +13,251 @@ # See the License for the specific language governing permissions and # limitations under the License. -errcatch +### setup +source /a/bin/errhandle/err +src="$(readlink -f -- "$BASH_SOURCE")"; src=${src%/*} # directory of this file -set -x +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_compat=$(debian-codename-compat) pending_reboot=false sed="sed --follow-symlinks" - # template case $distro in esac +#### initial packages pup -pi aptitude - -simple_packages=( - htop - iptables - mailutils - nmon - rdiff-backup - ruby - ruby-rest-client - tree - vim - wcd - wget -) - -case $HOSTNAME in - lj|li) : ;; - *) - # universal packages - # swh-plugins is for karaoke pulsaudio filter. - # mutagen for pithos - # guvcview set webcam brightness to highest - # pidgin-otr, i went into pidgin pluggin settings and generated a key for some accounts - simple_packages+=( - apache2 - apache2-doc - apt-doc - apt-listchanges - aptitude-doc-en - bash-doc - beets - beets-doc - binutils-doc - bind9-doc - bind9utils - bwm-ng - cloc - cpulimit - cron - debconf-doc - dirmngr - dnsutils - dnsmasq - dtrx - duplicity - eclipse - evince - fdupes - feh - filelight - flashrom - gawk-doc - gcc-doc - gdb - gdb-doc - geoip-bin - git-doc - git-email - gitk - glibc-doc - goaccess - gnome-screenshot - guvcview - i3lock - inetutils-traceroute - iperf3 - iproute2-doc - jq - kid3-qt - kid3-cli - linux-doc - locate - lshw - make-doc - manpages - manpages-dev - mb2md - meld - mps-youtube - mumble - nagstamon - ncdu - nginx-doc - nmap - offlineimap - oathtool - opendkim-tools - p7zip - paprefs - parted-doc - pavucontrol - pdfgrep - perl-doc - pianobar - pidgin - pidgin-otr - pry - python-autopep8 - python3-doc - python3-mutagen - qrencode - reportbug - $(aptitude show ruby | sed -rn 's/Depends: (.*)/\1/p')-doc - sqlite3-doc - squashfs-tools - swh-plugins - tar-doc - tcpdump - telnet - transmission-remote-gtk - vlc - whois - wondershaper - ) - spa $(apt-cache search ruby[.0-9]+-doc| awk '{print $1}') - ;; -esac +if isdeb; then + pi aptitude +fi +# avoid ptompts! +s debconf-set-selections </dev/null; then - # this condition is just a speed optimization - pi apt-file - s apt-file update - fi - # for debconf-get-selections - spa debconf-utils - ;; -esac - - -case $distro in - arch|debian|trisquel|ubuntu) - spa bash-completion - ;; - # others unknown -esac - - - +if isdeb && ! dpkg -s -- "$@" | grep -Fx "Status: install ok installed" &> /dev/null; then + # this condition is just a speed optimization + pi apt-file + s apt-file update +fi # disable motd junk. case $distro in - 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 - ;; + 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 + ;; + 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 - -# we've got a few dependencies later on, so install them now. -pi eatmydata -s eatmydata apt-get -y install --purge --auto-remove "${simple_packages[@]}" -simple_packages=() - ### 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" + # 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 $codename_compat stable" + + if ! grep -xFq "$l" /etc/apt/sources.list{,.d/*.list}; then + sudo add-apt-repository "$l" p update - pi docker-ce - sgo docker - # other distros unknown + 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 fi ### end docker 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 - if isdebian-testing; then - pi --install-suggests certbot - else - pi --install-suggests -t jessie-backports certbot - fi - # 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 + +### 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 + s add-apt-repository -y ppa:certbot/certbot ||: + p update + fi + pi python-certbot-apache +else + die "distro unknown for certbot" +fi +# 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 +$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 - - ;; - 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 +ser daemon-reload +sgo certbotmail.timer +### end certbot install ### + + +# dogcam setup. not using atm +# case $HOSTNAME in +# lj|li) +# /a/bin/webcam/install-server +# ;; +# kw) +# /a/bin/webcam/install-client +# ;; +# esac + +pi ${p1[@]} + +##### begin automatic upgrades #### +# this makes it so we upgrade everything +s debconf-set-selections <<'EOF' +unattended-upgrades unattended-upgrades/origins_pattern string "codename=${distro_codename}"; +EOF +s dpkg-reconfigure -u -fnoninteractive unattended-upgrades + +# Setup daily reboots, so all unattended upgrades go into affect +# unattended upgrades happen at 6 am + rand(60 min). +echo '20 7 * * * root /usr/local/bin/zelous-unattended-reboot' | s dd of=/etc/cron.d/unattended-upgrade-reboot +##### end automatic upgrades #### + +# office is not exposed to internet yet +if [[ $(hostname -f) != *.office.fsf.org ]]; 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 # 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 - #$src/phab-setup - - 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' + 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 + sgo mumble-server - vpn-server-setup -d - tee /etc/openvpn/client-config/mail <<'EOF' + 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 < @@ -397,20 +297,20 @@ EOF # 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 ########## + ########## 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' + # 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", @@ -434,33 +334,41 @@ EOF "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/iank - 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 - - s mkdir -p /var/log/pumpio/ - s chown pumpio:pumpio /var/log/pumpio/ - - web-conf - apache2 pump.iankelling.org <<'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 @@ -476,15 +384,16 @@ EOF EOF - sudo -i <<'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' + s dd of=/etc/systemd/system/pump.service <<'EOF' [Unit] Description=pump.io -After=syslog.target network.target +After=syslog.target network.target mongodb.service +Requires=mongodb.service [Service] Type=simple @@ -499,41 +408,47 @@ Environment=NODE_PATH=/usr/lib/nodejs:/usr/lib/node_modules:/usr/share/javascrip [Install] WantedBy=multi-user.target EOF - ser daemon-reload - sgo pump - ########## end pump.io setup ############ + ser daemon-reload + sgo pump + ########## end pump.io setup ############ + + ############# begin setup mastodon ############## - ############# 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 + # 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 + # note, docker required, but we installed it earlier - # i subscrubed to https://github.com/docker/compose/releases.atom - # to deal with updates manually. So far, it means just reving the - # version number, then restarting docker-compose with - # cd ~/mastodon - # docker-compose up -d - curl -L https://github.com/docker/compose/releases/download/1.13.0/docker-compose-`uname -s`-`uname -m` | s dd of=/usr/local/bin/docker-compose - s chmod +x /usr/local/bin/docker-compose + # i subscrubed to https://github.com/docker/compose/releases.atom + # to 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 ~ - 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) + 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 + # per instructions, uncomment redis/postgres persistence in docker-compose.yml + sed -i 's/^#//' docker-compose.yml - cat >.env.production <<'EOF' + cat >.env.production <<'EOF' REDIS_HOST=redis REDIS_PORT=6379 DB_HOST=db @@ -547,7 +462,7 @@ LOCAL_HTTPS=true SINGLE_USER_MODE=true -SMTP_SERVER=10.8.0.4 +SMTP_SERVER=mail.iankelling.org SMTP_PORT=25 SMTP_LOGIN=li SMTP_FROM_ADDRESS=notifications@mast.iankelling.org @@ -555,25 +470,46 @@ SMTP_DOMAIN=mast.iankelling.org SMTP_DELIVERY_METHOD=smtp EOF - for key in PAPERCLIP_SECRET SECRET_KEY_BASE OTP_SECRET; do - printf "%s=%s" $key "$(docker-compose run --rm web rake secret)" >>.env.production - done - s cat /etc/mailpass| while read -r domain port pass; do - if [[ $domain == mail.iankelling.org ]]; then - printf "SMTP_PASSWORD=%s" "$pass" >>.env.production - break - fi - done + 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 - 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 + # 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' + 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 ! @@ -588,83 +524,283 @@ EOF EOF - ############### !!!!!!!!!!!!!!!!! - ############### manual steps: - - # only following 2 people atm, so not bothering to figure out backups - # when mastodon has not documented it at all. - # - # fsf@status.fsf.org - # cwebber@toot.cat - # dbd@status.fsf.org - # johns@status.fsf.org + ############### !!!!!!!!!!!!!!!!! + ############### manual steps: - # 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 + # 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 - ############# end setup mastodon ############## +[Service] +ExecStart=/usr/bin/znc -f --datadir=/var/lib/znc +User=znc - # we use nsupdate to update the ip of home - pi bind9 +[Install] +WantedBy=multi-user.target +EOF + ser daemon-reload + sgo znc - echo "$0: $(date): ending now)" - exit 0 - ;; + echo "$0: $(date): ending now)" + exit 0 + ;; esac - ########### end section including li/lj ############### -case $distro in - debian) spa gnome-session-flashback ;; - # flidas is missing dependency gnome-panel. others unknown -esac +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 <$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' + 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. - # 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({ @@ -979,39 +1325,16 @@ 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 - ;; - # todo: others unknown + ;; + # 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 + # trisquel 8 = openvpn, debian stretch = openvpn-client vpn_ser=openvpn-client if [[ ! -e /lib/systemd/system/openvpn-client@.service ]]; then - vpn_ser=openvpn + vpn_ser=openvpn fi s dd of=/etc/systemd/system/transmission-daemon-nn.service </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 - fedora) cabal install shellcheck ;; - *) spa shellcheck ;; - # unknown for older ubuntu -esac - + 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 - arch|debian|trisquel|ubuntu) spa pumpa ;; - # others unknown. do have a buildscript: - # /a/bin/buildscripts/pumpa ;; esac case $distro in - debian) pi adb ;; - debian|trisquel|ubuntu) spa android-tools-adbd ;; - # todo: not sure this is needed anymore, or if trisqel etc works even - # debian) spa android-tools-adbd/unstable ;; - arch) spa android-tools ;; - # other distros unknown + 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 - 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 +# removed synergy since ive not used it in a long time +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) - s eatmydata apt-get -y install --purge --auto-remove task-mate-desktop - # in settings, change scrolling to two-finger, - # because the default edge scroll doesn\'t work. - pu transmission-gtk - ;; - trisquel) - # mate-indicator-applet and beyond are msc things I noticed diffing a - # standard install with mine. - s eatmydata apt-get -y install --purge --auto-remove xorg lightdm mate-desktop-environment mate-desktop-environment-extras mate-indicator-applet anacron - ;; - # others unknown -esac - -case $distro in - arch) spa apg ;; - - # already in debian jessie + arch) + sudo usermod -a -G uucp $USER + ;; 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 - -# [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 - -# [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|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 - - - -### kdeconnect for gnome. started in /a/bin/distro-setup/desktop-20-autostart.sh -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 +# 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 ######### @@ -1471,68 +1616,75 @@ 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 + + +sgo dynamicipupdate + + # 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),) +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 - -# on grub upgrade, we get prompts unless we do this 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) + 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|trisquel|ubuntu) pi btrbk ;; @@ -1540,34 +1692,62 @@ esac # esac cd /a/opt/btrbk s make install -spa pv # for progress bar when running interactively. - -# 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' +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|trisquel|ubuntu) s gpasswd -a iank 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 + + +# 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 @@ -1584,35 +1764,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 @@ -1629,77 +1809,60 @@ 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 - ;; + pi nfs-utils + ;; + debian|trisquel|ubuntu) + pi-nostart nfs-server + ;; + arch) + pi nfs-utils || pending_reboot=true + ;; esac - +# 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 192.168.1.0/24(rw,fsid=0,nohide,no_root_squash,async,no_subtree_check,insecure) + # 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|trisquel|ubuntu) - pi libosinfo-bin; - ;; -esac + # if I was going to create a persistent vm, i might do it like this: # variant=something # from: virt-install --os-variant list # s virt-install --noautoconsole --graphics spice,listen=0.0.0.0 \ - # --disk=/a/images/some_name.qcow2,bus=virtio --vcpus 2 -r 4096 -w bridge=br0 \ - # -n some_name --import --os-variant $variant --cpu host-model-only + # --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 ######### 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[@]}" - - 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