X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=distro-end;h=9f06366c8f3a1b0efde3830d45ea2d2484a74df4;hb=0310db0c0589445a132e77f0b7a8fbb5e1ae3082;hp=3b109c80d30d423bb2526b9fe1e081f560803bdc;hpb=f5c8ee56b55b90298b48c83ed0f7ec98cce96bb5;p=distro-setup diff --git a/distro-end b/distro-end index 3b109c8..9f06366 100755 --- a/distro-end +++ b/distro-end @@ -13,234 +13,67 @@ # See the License for the specific language governing permissions and # limitations under the License. +### setup errcatch +src="${BASH_SOURCE%/*}" +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" } - spa() { # simple package add simple_packages+=($@) } - distro=$(distro-name) - 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 ########### begin section including li ################ +pi ${p3[@]} $($src/distro-pkgs) conflink case $distro in - arch) - # ubuntu 14.04 uses b-cron, - # but its not maintained in arch. - # of the ones in the main repos, cronie is only one maintained. - # fcron appears abandoned software. - pi cronie - sgo cronie - ;; - *) : ;; # other distros come with cron. + arch) sgo cronie ;; esac - - case $distro in - *) pi at ;;& arch) sgo atd ;; esac case $distro in - debian|trisquel|ubuntu) pi curl;; - arch) : ;; - # fedora: unknown -esac - -case $distro in - # tk for gitk - arch) spa git tk ;; - *) spa git ;; -esac - -case $distro in - arch) spa the_silver_searcher ;; - debian|trisquel|ubuntu) spa silversearcher-ag ;; - # fedora unknown -esac - -case $distro in - debian|trisquel|ubuntu) spa ntp;; - arch) - pi ntp - sgo ntpd - ;; - # others unknown + arch) sgo ntpd ;; esac # no equivalent in other distros: case $distro in debian|trisquel|ubuntu) - pi aptitude if ! dpkg -s apt-file &>/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 - - - - - # disable motd junk. case $distro in debian) @@ -272,14 +105,8 @@ if isdebian; then setup-debian-auto-update fi -# we've got a few dependencies later on, so install them now. -pi eatmydata; PI_PREFIX=eatmydata -pi "${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 @@ -296,6 +123,7 @@ fi ### end docker install #### +### begin certbot install ### case $distro in debian) # note, need python-certbot-nginx for nginx, but it depends on nginx, @@ -306,32 +134,51 @@ case $distro in else pi certbot python-certbot-apache 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 -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 + # this fails with: + # + # gpg: key 75BCA694: public key "Launchpad PPA for certbot" imported + # gpg: Total number processed: 1 + # gpg: imported: 1 + # gpg: no valid OpenPGP data found. + # Failed to add key. + # + # but it seems to work fine, perhaps it's only failing on the second run. + s add-apt-repository -y ppa:certbot/certbot ||: p update 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 +s,^Description.*,\0 mail version, +EOF +$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 +### end certbot install ### -# website setup + +# dogcam setup case $HOSTNAME in lj|li) + /a/bin/webcam/install-server + ;; + kw) + /a/bin/webcam/install-client + ;; +esac +# website setup +case $HOSTNAME in + lj|li) case $HOSTNAME in lj) domain=iank.bid; exit 0 ;; li) domain=iankelling.org ;; @@ -361,6 +208,18 @@ 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 <>.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 @@ -632,31 +507,56 @@ 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 ;; esac - ########### end section including li/lj ############### -case $distro in - debian) spa gnome-session-flashback ;; - # flidas is missing dependency gnome-panel. others unknown -esac +pi ${p4[@]} $(apt-cache search ruby[.0-9]+-doc| awk '{print $1}') -case $distro in - trisquel|ubuntu|debian) spa ack-grep ;; - arch|fedora) spa ack ;; - # fedora unknown -esac - - -if isdeb; then - spa debian-goodies -fi case $distro in @@ -673,22 +573,6 @@ EOF ;; esac -case $distro in - debian) - spa cpio-doc ;; - # not packaged in flidas. others unknown. gfdl nonfree issue -esac - - - - -case $distro in - fedora) spa unrar ;; - *) spa unrar-free ;; -esac - - - ### begin home vpn server setup @@ -701,22 +585,23 @@ esac # vpn-server-setup -rds # s cp -r --parents /etc/openvpn/easy-rsa/keys /p/c/filesystem # s chown -R 1000:1000 /p/c/filesystem/etc/openvpn/easy-rsa/keys +# # kw = kgpe work machine. # for host in x2 kw; do -# vpn-mk-client-cert -b $host -n home b8.nz -# dir=/p/c/machine_specific/$host/filesystem/etc/openvpn/client -# mkdir -p $dir -# s bash -c "cp /etc/openvpn/client/home* $dir" +# vpn-mk-client-cert -b $host -n home b8.nz 1196 +# dir=/p/c/machine_specific/$host/filesystem/etc/openvpn/client +# mkdir -p $dir +# s bash -c "cp /etc/openvpn/client/home* $dir" # # note: /etc/update-resolv-conf-home also exists for all systems with /p # done - +# key already exists, so this won't generate one, just the configs. vpn-server-setup -rds s tee -a /etc/openvpn/server/server.conf <<'EOF' push "dhcp-option DNS 192.168.1.1" push "route 192.168.1.0 255.255.255.0" client-connect /a/bin/distro-setup/vpn-client-connect EOF -s sed -i --follow-symlinks 's/10.8./10.9./g' /etc/openvpn/server/server.conf +s sed -i --follow-symlinks 's/10.8./10.9./g;s/^\s*port\s.*/port 1196/' /etc/openvpn/server/server.conf if [[ $HOSTNAME == tp ]]; then if [[ -e /lib/systemd/system/openvpn-server@.service ]]; then @@ -730,6 +615,7 @@ fi if [[ $HOSTNAME == tp ]]; then + ##### rss2email # note, see bashrc for more documentation. pi rss2email s dd of=/etc/systemd/system/rss2email.service <<'EOF' @@ -762,8 +648,9 @@ EOF sgo rss2email.timer 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 @@ -789,9 +676,11 @@ EOF fi ######### end pump.io periodic backup ############# + 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 @@ -814,9 +703,8 @@ lnf /a/opt/.AndroidStudio2.2 ~ spa lib32stdc++6 default-jdk +############# begin syncthing setup ########### if [[ $HOSTNAME == frodo ]]; then - ############# begin syncthing setup ########### - # It\'s simpler to just worry about running it in one place for now. # I assume it would work to clone it\'s config to another non-phone # and just run it in one place instead of the normal having a @@ -843,6 +731,7 @@ if [[ $HOSTNAME == frodo ]]; then ;; esac lnf -T /w/syncthing /home/iank/.config/syncthing + ser daemon-reload # syncthing likely not properly packaged sgo syncthing@iank # runs as iank # these things persist in ~/.config/syncthing, which I save in @@ -860,7 +749,7 @@ if [[ $HOSTNAME == frodo ]]; then # Set gui username and password. # # install syncthing via f-droid, - # folder setting, turn off master folder (makes it read only). + # folder setting, turn off send only. # on phone, add device, click bar code icon # on dekstop, top right, actions, device id # after adding, notification will appear on desktop to confirm @@ -871,7 +760,8 @@ if [[ $HOSTNAME == frodo ]]; then # notification will appear in android\'s notifications, you have to # swipe down and tap it to add the folder. It won\'t appear in the # syncthing ui, which would be intuitive, but don\'t wait for it - # there. + # there. The notification may not work, instead open the web gui + # from in the app, there should be a notification within there. # # On phone, set settings to run syncthing all the time, and # show no notification. @@ -886,21 +776,56 @@ if [[ $HOSTNAME == frodo ]]; then # Note, the other thing i did was port forward port 22000, # per https://docs.syncthing.net/users/firewall.html - ############# end syncthing setup ########### fi +############# end syncthing setup ########### -# no equivalent in other distros: -case $distro in - debian|trisquel|ubuntu) - # for gui bug reporting - spa python-vte - ;; -esac +####### begin misc packages ########### +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 -####### misc packages ########### +if [[ ! -e ~/.linphonerc && -e /p/.linphonerc-initial ]]; then + cp /p/.linphonerc-initial ~/.linphonerc +fi + + +### begin spd install +pi libswitch-perl libdigest-md5-file-perl libgnupg-interface-perl +t=$(mktemp) +wget -O $t http://mirror.fsf.org/fsfsys-trisquel/fsfsys-trisquel/pool/main/s/spd-perl/spd-perl_0.2-1_amd64.deb +s dpkg -i $t +rm $t +# this guesses at the appropriate directory, adjust if needed +x=(/usr/lib/x86_64-linux-gnu/perl/5.*) +sudo ln -sf ../../../perl/5.18.2/SPD/ $x +# newer distro had gpg2 as default, older one, flidas, need to make it that way +x=$(which gpg2) +if [[ $x ]]; then + s lnf -T $x /usr/local/bin/gpg +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: @@ -913,7 +838,23 @@ esac # services on unreachable osts # hosts in soft state # services in soft state -# in display tab: icon in systray. +# in display tab: fullscreen + +# these translate to these settings I think +# filter_acknowledged_hosts_services = True +# filter_all_unknown_services = True +# filter_all_warning_services = True +# filter_hosts_in_soft_state = True +# filter_hosts_services_maintenance = True +# filter_services_in_soft_state = True +# filter_services_on_down_hosts = True +# filter_services_on_hosts_in_maintenance = True +# filter_services_on_unreachable_hosts = True +# notify_if_up = False +# statusbar_floating = False +# fullscreen = True +# but i'm just going to rely on the webpage plus sms for now. + case $distro in debian|trisquel|ubuntu) @@ -925,6 +866,77 @@ case $distro in # others unknown esac +# /run and /dev/shm are listed as required for pulseaudio. All 4 in the group +# listed in the default config as suggested. +# /run/usr/1000 i noticed was missing for pulseaudio +# /run/user/0 just seemed like a not bad idea, given the above +tu /etc/schroot/desktop/fstab <<'EOF' +/run /run none rw,bind 0 0 +/run/lock /run/lock none rw,bind 0 0 +/dev/shm /dev/shm none rw,bind 0 0 +/run/shm /run/shm none rw,bind 0 0 +/run/user/1000 /run/user/1000 none rw,bind 0 0 +/run/user/1001 /run/user/1001 none rw,bind 0 0 +/run/user/0 /run/user/0 none rw,bind 0 0 +EOF + +mkschroot() { + n=$1 + shift + apps=($@) + d=/nocow/schroot/$n + s dd of=/etc/schroot/chroot.d/$n.conf <