X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=distro-end;h=660d556ea2363d9220ab9859c09fc3d2b4403f97;hb=b5152768e90016afe8ff2d55cc9f38d08396b0fc;hp=ea16efc5a1f204fd44d04163903729fcd4749b6c;hpb=aeb3f88455a90def90a645a7b5567d55dda18339;p=distro-setup diff --git a/distro-end b/distro-end index ea16efc..660d556 100755 --- a/distro-end +++ b/distro-end @@ -22,6 +22,8 @@ echo "$0: $(date): starting now)" src="${BASH_SOURCE%/*}" +source $src/pkgs + # see example of usage to understand. end_msg() { local y @@ -43,134 +45,16 @@ case $distro in esac pup -pi aptitude - -simple_packages=( - htop - iptables - mailutils - nmon - rdiff-backup - ruby - ruby-rest-client - tree - vim - wcd - wget -) +if isdeb; then + pi aptitude +fi + +simple_packages=(${p3[@]}) 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 - # xawtv has webcam cli control. v4lctl bright 80%; v4lctl list - # guvcview also adjusts webcam - simple_packages+=( - adb - 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 - debootstrap - 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 - konsole - linphone - 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 - qrencode - reportbug - $(aptitude show ruby | sed -rn 's/Depends: (.*)/\1/p')-doc - schroot - sqlite3-doc - squashfs-tools - swh-plugins - tar-doc - tcpdump - telnet - transmission-remote-gtk - vlc - whois - wondershaper - xawtv - xbacklight - xprintidle - xscreensaver - xscreensaver-data-extra - xscreensaver-gl - xscreensaver-gl-extra - ) + simple_packages+=(${p4[@]}) spa $(apt-cache search ruby[.0-9]+-doc| awk '{print $1}') ;; esac @@ -408,7 +292,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 +578,45 @@ 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 chown -R znc:znc /var/lib/znc/config + 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 +750,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 +778,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 +896,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 @@ -1644,7 +1591,11 @@ case $distro in sudo usermod -a -G uucp $USER ;; 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 +1856,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 ;;