From 5fc2a328a44bd7aac3110e7d9c49eaa3e0db8aaf Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Mon, 21 Oct 2019 20:39:09 -0400 Subject: [PATCH] various updates some fixes. remove arch stuff, I'm not going to get around to parabola any time soon. autoupdate everything I can. --- Makefile | 6 +- distro-end | 455 +++++++---------------------- filesystem/usr/local/bin/myupgrade | 9 + mail-setup | 14 +- mount-latest-remote | 5 +- pkgs | 2 + schrootupdate | 10 +- 7 files changed, 126 insertions(+), 375 deletions(-) diff --git a/Makefile b/Makefile index 2d066dc..37aeef9 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ all: ~/.local/distro-begin ~/.local/distro-end -~/.local/distro-begin: distro-begin - distro-begin mail-setup +~/.local/distro-begin: distro-begin mail-setup /a/bin/buildscripts/emacs + distro-begin -~/.local/distro-end: distro-end distro-pkgs pkgs primary-setup +~/.local/distro-end: distro-end distro-pkgs pkgs primary-setup /a/bin/buildscripts/tor-browser /a/bin/buildscripts/go /a/bin/buildscripts/rust /a/bin/buildscripts/misc distro-end diff --git a/distro-end b/distro-end index 3772e87..61008fa 100755 --- a/distro-end +++ b/distro-end @@ -70,16 +70,6 @@ pi ${p2[@]} conflink -case $distro in - arch) sgo cronie ;; -esac - -case $distro in - arch) sgo atd ;; - # not needed for deb, dependency of at. -esac - - # no equivalent in other distros: if isdeb && pcheck apt-file; then @@ -601,16 +591,11 @@ esac # 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 +# website is dead june 14 2019. back in october, but meh s rm -f /etc/apt/sources.list.d/iridium-browser.list # case $distro in # debian) @@ -780,17 +765,6 @@ esac /a/bin/distro-setup/radicale-setup -## android studio setup -# this contains the setting for android sdk to point to -# /a/opt/androidsdk, which is asked upon first run -lnf /a/opt/.AndroidStudio2.2 ~ -# android site says it needs a bunch of packages for ubuntu, -# but I googled for debian, and someone says you just need lib32stdc++6 plus the -# jdk -# https://pid7007blog.blogspot.com/2015/07/installing-android-studio-in-debian-8.html -# see w.org for more android studio details -spa lib32stdc++6 default-jdk - ############# begin syncthing setup ########### if [[ $HOSTNAME == frodo ]]; then @@ -799,26 +773,21 @@ if [[ $HOSTNAME == frodo ]]; then # and just run it in one place instead of the normal having a # separate config. I lean toward using the same config, since btrfs # syncs between comps. - case $distro in - arch) pi syncthing ;; - trisquel|ubuntu|debian) - # testing has relatively up to date packages - if ! isdebian-testing; then - # based on error when doing apt-get update: - # E: The method driver /usr/lib/apt/methods/https could not be found. - pi apt-transport-https - # google led me here: - # https://apt.syncthing.net/ - curl -s https://syncthing.net/release-key.txt | sudo apt-key add - - s="deb http://apt.syncthing.net/ syncthing release" - if [[ $(cat /etc/apt/sources.list.d/syncthing.list) != "$s" ]]; then - echo "$s" | s dd of=/etc/apt/sources.list.d/syncthing.list - p update - fi - fi - pi syncthing - ;; - esac + # testing has relatively up to date packages + if ! isdebian-testing; then + # based on error when doing apt-get update: + # E: The method driver /usr/lib/apt/methods/https could not be found. + pi apt-transport-https + # google led me here: + # https://apt.syncthing.net/ + curl -s https://syncthing.net/release-key.txt | sudo apt-key add - + s="deb http://apt.syncthing.net/ syncthing release" + if [[ $(cat /etc/apt/sources.list.d/syncthing.list) != "$s" ]]; then + echo "$s" | s dd of=/etc/apt/sources.list.d/syncthing.list + p update + fi + fi + pi syncthing lnf -T /w/syncthing /home/iank/.config/syncthing ser daemon-reload # syncthing likely not properly packaged sgo syncthing@iank # runs as iank @@ -920,15 +889,6 @@ fi ### end spd install -if [[ $HOSTNAME == kw ]]; then - cat <<'EOF' -NOTE: after this finishes, i did -s nmtui-connect -# remove br from auto: -s vim /etc/network/interfaces -EOF -fi - # nagstamon setting which were set through the ui # in filters tab: # all unknown sources @@ -958,15 +918,10 @@ fi # but i'm just going to rely on the webpage plus sms for now. -case $distro in - debian|trisquel|ubuntu) - # it asks if it should make users in it's group capture packets without root, - # which is arguably more secure than running wireshark as root. default is no, - # which is what i prefer, since I plan to use tcpdump to input to wireshark. - s DEBIAN_FRONTEND=noninteractive pi wireshark-gtk - ;; - # others unknown -esac +# it asks if it should make users in it's group capture packets without root, +# which is arguably more secure than running wireshark as root. default is no, +# which is what i prefer, since I plan to use tcpdump to input to wireshark. +s DEBIAN_FRONTEND=noninteractive pi wireshark-gtk # /run and /dev/shm are listed as required for pulseaudio. All 4 in the group # listed in the default config as suggested. @@ -1061,33 +1016,21 @@ s chown $USER:$USER /nocow/user pi anki +####### begin transmission + # adapted from /var/lib/dpkg/info/transmission-daemon.postinst # 450 seems likely to be unused. we need to specify one or else # it won't be stable across installs. if ! getent passwd debian-transmission > /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 @@ -1095,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: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' +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({ @@ -1161,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 @@ -1268,27 +1206,10 @@ EOF fi ######### end transmission client setup ###### -# dunno why it\'s there, but get rid of it -case $HOSTNAME in - li|lj) s rm -rf /home/linode ;; -esac - ### printer setup -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 - ;; - debian|trisquel|ubuntu) - pi cups - s gpasswd -a $USER lpadmin # based on ubuntu wiki - spa hplip - ;; - # other distros unknown -esac +pi cups hplip +s gpasswd -a $USER lpadmin # based on ubuntu wiki # goto http://127.0.0.1:631 # administration tab, add new printer button. # In debian, I could use hte recommended driver, @@ -1310,71 +1231,10 @@ for x in iank user2; do s usermod -a -G libvirt,kvm $x; done # general known for debian/ubuntu, not for fedora -case $distro in - 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) - 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 - ;; - -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 - +/a/bin/buildscripts/go +pi-nostart virtinst virt-manager -# removed synergy since ive not used it in a long time pi --no-install-recommends kdeconnect @@ -1399,11 +1259,6 @@ pi --no-install-recommends kdeconnect # 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. @@ -1494,39 +1349,7 @@ EOF sgo btrfsmaint.timer sgo btrfsmaintstop.timer - -# the wiki backup script from ofswiki.org uses generic paths -s lnf /p/c/machine_specific/li/mw_vars /root -s lnf /k/backup/wiki_backup /root - - -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 - -# # 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 @@ -1548,113 +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 -# 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 +# # 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 -# 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 -#### 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 +pi tor +/a/bin/buildscripts/tor-browser # 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 - ;; - debian|trisquel|ubuntu) - pi-nostart nfs-server - ;; - arch) - pi nfs-utils || pending_reboot=true - ;; -esac +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 diff --git a/filesystem/usr/local/bin/myupgrade b/filesystem/usr/local/bin/myupgrade index 712047a..1b39e7f 100755 --- a/filesystem/usr/local/bin/myupgrade +++ b/filesystem/usr/local/bin/myupgrade @@ -13,6 +13,15 @@ if [[ $HOSTNAME == "$MAIL_HOST" || $hn == li.b8.nz ]]; then exit 0 fi +l() { + "$@" |& systemd-cat -t myupgrade +} +l /a/bin/buildscripts/tor-browser +l /a/bin/buildscripts/go +l /a/bin/buildscripts/rust +l /a/bin/buildscripts/misc +l go get -u mvdan.cc/fdroidcl + cmd="$s /usr/sbin/checkrestart -p" if [[ $($cmd | sed '/^Found 0 processes using old versions of upgraded files$/d' | wc -l) != 0 ]]; then $cmd -v | pee cat "wall -n" diff --git a/mail-setup b/mail-setup index 4414c2a..f262302 100755 --- a/mail-setup +++ b/mail-setup @@ -400,11 +400,10 @@ b=userforward_higher_priority sed -r s/^\\S+:/$b:/ 600_exim4-config_userforward >175_$b -m rm -f /etc/exim4/conf.d/main/000_localmacros # old filename +rm -vf /etc/exim4/conf.d/main/000_localmacros # old filename cat >/etc/exim4/conf.d/main/000_local <&2' ERR [[ $EUID == 0 ]] || exec sudo -E "${BASH_SOURCE[0]}" "$@" -for n in stretch jessie; do - if [[ -e /etc/schroot/chroot.d/$n.conf ]]; then - cd - schroot -c $n -- apt-get -y dist-upgrade --purge --auto-remove - fi +for n in stretch; do + if [[ -e /etc/schroot/chroot.d/$n.conf ]]; then + cd + schroot -c $n -- apt-get -y dist-upgrade --purge --auto-remove + fi done -- 2.30.2