From: Ian Kelling Date: Mon, 22 Jan 2018 01:30:03 +0000 (-0500) Subject: fix some things, add znc arbtt X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=commitdiff_plain;h=dd2ab37728aeaf8b887d128c50601fb5d9bd8841 fix some things, add znc arbtt --- diff --git a/distro-begin b/distro-begin index a408d27..9a7a9ad 100755 --- a/distro-begin +++ b/distro-begin @@ -289,11 +289,14 @@ case $distro in trisquel|ubuntu) # noticed in flidas. #https://bugs.launchpad.net/ubuntu/+source/module-init-tools/+bug/240553 + #https://wiki.debian.org/KernelModuleBlacklisting + #common advice when searching is to use /etc/modprobe.d/blacklist.conf, + #but that file won't work and will get automatically reverted sudo rmmod evbug ||: # might not be loaded yet - file=/etc/modprobe.d/blacklist.conf + file=/etc/modprobe.d/evbug.conf line="blacklist evbug" if ! grep -xFq "$line" $file; then - sudo tee -a $file &>/dev/null <<<"$line" + sudo dd of=$file 2>/dev/null <<<"$line" sudo depmod -a sudo update-initramfs -u fi diff --git a/distro-end b/distro-end index ea16efc..96fd07b 100755 --- a/distro-end +++ b/distro-end @@ -119,6 +119,7 @@ case $HOSTNAME in kid3-qt kid3-cli konsole + libreoffice linphone linux-doc locate @@ -129,6 +130,7 @@ case $HOSTNAME in mb2md meld mps-youtube + mpv mumble nagstamon ncdu @@ -408,7 +410,6 @@ COMMIT EOF - sudo dd of=/etc/systemd/system/vpnmail.service <>.env.production + # 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 - s cat /etc/mailpass| while read -r domain port pass; do + 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 + 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 @@ -679,6 +696,44 @@ EOF # 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 + # 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 + # added LoadModule = log -sanitize to the top level + # 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. + # 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. + # todo: figure out how to make playback in erc happe.n + 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 dd of=/etc/systemd/system/znc.service 2>/dev/null <<'EOF' +[Unit] +Description=ZNC, an advanced IRC bouncer +After=network-online.target + +[Service] +ExecStart=/usr/bin/znc -f --datadir=/var/lib/znc +User=znc + +[Install] +WantedBy=multi-user.target +EOF + ser daemon-reload + sgo znc + echo "$0: $(date): ending now)" exit 0 ;; @@ -812,7 +867,7 @@ EOF fi ######### begin pump.io periodic backup ############# -if [[ $HOSTNAME == tp ]]; then +if [[ $HOSTNAME == frodo ]]; then s dd of=/etc/systemd/system/pumpbackup.service <<'EOF' [Unit] Description=pump li backup @@ -840,7 +895,8 @@ fi case $distro in debian|trisquel|ubuntu) - # suggests because we want the resolvconf package. + # suggests because we want the resolvconf package. however, i install it earlier + # as well, so this is redundant. # todo: check other distros to make sure it\'s installed pi-nostart --install-suggests openvpn # pi-nostart does not disable @@ -957,6 +1013,14 @@ reset-sakura sudo -u traci -i reset-sakura reset-konsole sudo -u traci -i reset-konsole +reset-xscreensaver +# this is packaged, but i see it's gotten a fair amount of development lately, +# so install from cabal. the options are needed to get over incompatible xmonad library versions +# but that stuff is in the global namespace, and it seems they don't conflict in practice. +pi libxss-dev # dependency based on build failure +cabal update +cabal install --upgrade-dependencies --force-reinstalls arbtt +lnf -T /m/arbtt-capture.log ~/.arbtt/capture.log if [[ ! -e ~/.linphonerc && -e /p/.linphonerc-initial ]]; then cp /p/.linphonerc-initial ~/.linphonerc @@ -1646,6 +1710,11 @@ case $distro in esac lnf -T /a/opt/sketches ~/Arduino +# 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 ######### @@ -1905,12 +1974,6 @@ esac ######### 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 ;; diff --git a/mail-route b/mail-route index 29f152b..95cbf8d 100755 --- a/mail-route +++ b/mail-route @@ -81,6 +81,7 @@ show() { } +# code common to start and stop. modify() { # match source or dest port. note, when we send to a port, it picks a random high port as # the source. diff --git a/mail-setup b/mail-setup index afbc194..930ddcc 100755 --- a/mail-setup +++ b/mail-setup @@ -850,6 +850,28 @@ dovecot_lmtp: batch_max = 200 EOF + cat >/etc/exim4/conf.d/router/190_exim4-config_fsfsmarthost <<'EOF' +# smarthost for fsf mail +# ian: copied from /etc/exim4/conf.d/router/200_exim4-config_primary, and added senders = and +# replaced DCsmarthost with mail.fsf.org +fsfsmarthost: + debug_print = "R: smarthost for $local_part@$domain" + driver = manualroute + domains = ! +local_domains + senders = *@fsf.org + transport = remote_smtp_smarthost + route_list = * mail.fsf.org byname + host_find_failed = ignore + same_domain_copy_routing = yes + no_more +EOF + + # https://blog.dhampir.no/content/make-exim4-on-debian-respect-forward-and-etcaliases-when-using-a-smarthost + # i only need .forwards, so just doing that one. + cd /etc/exim4/conf.d/router + b=userforward_higher_priority + # replace the router name so it is unique + sed -r s/^\\S+:/$b:/ 600_exim4-config_userforward >175_$b # begin setup passwd.client f=/etc/exim4/passwd.client @@ -861,12 +883,6 @@ EOF done # end setup passwd.client - # https://blog.dhampir.no/content/make-exim4-on-debian-respect-forward-and-etcaliases-when-using-a-smarthost - # i only need .forwards, so just doing that one. - cd /etc/exim4/conf.d/router - b=userforward_higher_priority - # replace the router name so it is unique - sed -r s/^\\S+:/$b:/ 600_exim4-config_userforward >175_$b systemctl restart exim4 fi #### end if exim4 diff --git a/mastodon-upgrade b/mastodon-upgrade index 00cda2a..8958f7f 100755 --- a/mastodon-upgrade +++ b/mastodon-upgrade @@ -8,7 +8,7 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR [[ $EUID == 0 ]] || exec sudo -E "$BASH_SOURCE" "$@" -cd /home/ian/mastodon +cd /home/iank/mastodon git fetch git stash git checkout $(git tag | grep -v rc | tail -n1) diff --git a/mymimes b/mymimes index 010d418..2130c37 100755 --- a/mymimes +++ b/mymimes @@ -8,7 +8,7 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR shopt -s extglob nullglob echo '[Default Applications]' >/etc/xdg/defaults.list -sed -r '/^MimeType=/!d;s/^MimeType=//;s/;/=mpv.desktop;\n/g' /usr/share/applications/mpv.desktop >>/etc/xdg/defaults.list +sed -r '/^MimeType=/!d;s/^MimeType=//;s/;/=mpv.desktop\n/g' /usr/share/applications/mpv.desktop >>/etc/xdg/defaults.list # this is the new one, according to # https://specifications.freedesktop.org/mime-apps-spec/mime-apps-spec-1.0.html @@ -19,3 +19,5 @@ cp /etc/xdg/defaults.list /etc/xdg/mimapps.list for f in /usr/share/applications/!(defaults).list; do cp /etc/xdg/defaults.list /etc/xdg/${f##*/} done + +update-desktop-database diff --git a/switch-mail-host b/switch-mail-host index 96e03ef..9315807 100755 --- a/switch-mail-host +++ b/switch-mail-host @@ -120,6 +120,15 @@ if $old_shell systemctl is-active btrbk.timer; then restore_old_btrbk=true fi +for ((i=0; i<10; i++)); do + $old_shell killall arbtt-capture || break + sleep 1 + if [[ i == 9 ]]; then + warn="WARNING!!! failed to kill arbtt-capture" + fi + done + + $new_shell bash -s <<'EOF' set -eE if mountpoint /m; then sudo umount /m; fi @@ -208,3 +217,7 @@ fi if $restore_old_btrbk; then $old_shell sudo systemctl start btrbk.timer fi + +$new_shell arbtt-capture --sample-rate=10 & + +echo $warn