X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=distro-begin;h=75b9b05942ce0ae042d0cd3b188bdfcb2f1a0317;hb=7d5e9e87105fafa2243603f958c8b41cdaa7f0ad;hp=ec39e9d1160a610c10fa07ffd9ece72b38e62410;hpb=c8f87d4173949b8d96c9c34e2d2c0730caeba0eb;p=distro-setup diff --git a/distro-begin b/distro-begin index ec39e9d..75b9b05 100755 --- a/distro-begin +++ b/distro-begin @@ -1,4 +1,4 @@ -#!/bin/bash -l +#!/bin/bash # Copyright (C) 2016 Ian Kelling # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -14,20 +14,39 @@ # limitations under the License. # for setting up a new machine -# usage: $0 [-r] HOSTNAME +# usage: $0 [-r] [HOSTNAME] +# HOSTNAME changes the machine's hostname # tips: # run any sudo command first so your pass is cached # set the scrollback to unlimited in case something goes wrong +# send to registrar, glue records: +# for iankelling.org: + +# ns1.iankelling.org 72.14.176.105 +# ns1.iankelling.org 2600:3c00::f03c:91ff:fe6d:baf8 +# ns2.iankelling.org 172.105.84.95 +# ns2.iankelling.org 2a01:7e01::f03c:91ff:feb5:baec + +# for zroe.org: + +# ns1.zroe.org 72.14.176.105 +# ns1.zroe.org 2600:3c00::f03c:91ff:fe6d:baf8 +# ns2.zroe.org 172.105.84.95 +# ns2.zroe.org 2a01:7e01::f03c:91ff:feb5:baec +# + + + ####### begin setup environment ####### ### make ssh interactive shell run better. for when running line interactively line by line -sudo bash -c 'source /a/c/.bashrc && source /a/exe/ssh-emacs-setup' - +sudo bash -c '/a/exe/ssh-emacs-setup' +if [[ -s ~/.bashrc ]];then . ~/.bashrc;fi ##### setup error handling interactive=true # set this to false to force set -x [[ $- == *i* ]] || interactive=false @@ -36,6 +55,12 @@ if ! $interactive; then fi source /a/bin/errhandle/err +errcatch-cleanup() { + echo 1 >~/.local/distro-begin +} + +source /a/bin/distro-functions/src/package-manager-abstractions + ### setup logging exec &> >(sudo tee -a /var/log/distro-begin) echo "$0: $(date): starting now)" @@ -54,9 +79,11 @@ fi ### arg parsing recompile=false +emacs=true while [[ $1 == -* ]]; do case $1 in -r) recompile=true; shift ;; + -e) emacs=false; shift ;; esac done if [[ $1 ]]; then @@ -65,24 +92,27 @@ fi ##### variables/env setup -script_dir="$(readlink -f "$BASH_SOURCE")"; script_dir=${script_dir%/*} +script_dir="$(readlink -f "${BASH_SOURCE[@]}")"; script_dir=${script_dir%/*} +# shellcheck source=./pkgs source $script_dir/pkgs set +x source /a/bin/distro-functions/src/identify-distros $interactive || set -x -for f in iank-dev htpc kd x2 x3 frodo tp li lj demohost kw fz; do +for f in kd x2 x3 frodo tp li l2 demohost kw; do eval "$f() { [[ $HOSTNAME == $f ]]; }" done codename=$(debian-codename) -has_wayland() { [[ $codename == buster ]]; } -has_x() { [[ $codename != buster ]]; } +has_wayland() { has_monitor && [[ $codename == buster ]]; } +has_x() { has_monitor && [[ $codename != buster ]]; } has_monitor() { ! linode ; } -linode() { lj || li; } +linode() { l2 || li; } +# linode actually has btrfs now, but we dont do anything with it. has_btrfs() { ! linode; } -home_network() { ! linode; } -encrypted() { has_p; } +home_network() { ! linode && ! kw; } +has_p() { ! linode; } +encrypted() { true; } shopt -s extglob -export GLOBIGNORE=*/.:*/.. +export GLOBIGNORE="*/.:*/.." umask 022 PATH="/a/exe:$PATH" sed="sed --follow-symlinks" @@ -99,6 +129,8 @@ if encrypted; then sudo dd of=/etc/systemd/system/keyscripton.service <<'EOF' [Unit] Description=Turn on automatic decryption of drives on boot +# This is triggered by reboot and when keyscriptoff stops. + # tried using graphical.target, but it made my display manager restart before rebooting. # generally, I don't think targets order shutdown like they do startup. # So, I did systemd-analyze plot > something.svg, and picked a reliably started @@ -118,8 +150,6 @@ ExecStop=/a/exe/keyscript-on WantedBy=keyscriptoff.service EOF sudo systemctl daemon-reload # needed if the file was already there - sudo systemctl stop keyscripton.service - # sudo systemctl start keyscripton.service sudo systemctl enable keyscripton.service sudo dd of=/etc/systemd/system/keyscriptoff.service <<'EOF' @@ -137,14 +167,24 @@ EOF sudo systemctl enable keyscriptoff.service sudo systemctl start keyscriptoff.service + pi rsync + # from /usr/share/doc/dropbear-initramfs/README.initramfs.gz - while read m _; do /sbin/modinfo -F filename "$m"; done /dev/null; then + sudo dd if=$tmp of=/etc/initramfs-tools/modules + sudo /usr/sbin/update-initramfs -u -k all + fi # initram auth keys get setup with rootsshsync + $script_dir/rootsshsync # then for remote unlock, ssh and do this once per crypt disk: # echo -n PASS >/lib/cryptsetup/passfifo + # or for buster+ + # cryptroot-unlock + fi ##### end setup encryption scripts ###### @@ -154,19 +194,6 @@ fi # todo, it would be nice to cut down on some of the output -##### fedora prereq/fundamental settings -if isfedora; then - # comment out line disallowing calling sudo in scripts - sudo $sed -i 's/^Defaults *requiretty/#\0 # ian commented/' /etc/sudoers - # turn on magic sysrq commands - echo 1 > sudo dd of=/proc/sys/kernel/sysrq - echo "kernel.sysrq = 1" > /etc/sysctl.d/90-sysrq.conf - # selinux is not user friendly. Like, you enable samba, but you haven't run the magic selinux commands so it doesn't work - # and you have no idea why. - sudo $sed -i 's/^\(SELINUX=\).*/\1disabled/' /etc/selinux/config - selinuxenabled && sudo setenforce 0 -fi - #### rerun my fai-time scripts # already ran for pxe installs, but used for vps & updates @@ -182,8 +209,14 @@ case $distro in esac ###### setup hostname -sudo $sed -i '/^127\.0\.1\.1/d' /etc/hosts -echo "127.0.1.1 $HOSTNAME.b8.nz $HOSTNAME" | sudo tee -a /etc/hosts +if [[ $HOSTNAME != $(cat /etc/hostname) ]]; then + echo $HOSTNAME > /etc/hostname + hostname -F /etc/hostname +fi +sudo sed -i --follow-symlinks -f - /etc/hosts </dev/null || sudo groupadd -r bind +# linode needs bind group before conflink +if linode; then + pi-nostart bind9 fi # this needs to be before installing pacserve so we have gpg conf. conflink @@ -213,22 +246,28 @@ conflink set +x err-allow source /etc/profile.d/environment.sh +export BRC=t +# shellcheck source=./.bashrc source ~/.bashrc err-catch $interactive || set -x #### setup passwordless sudo -tu /etc/sudoers </dev/null <<<"$line" sudo depmod -a sudo update-initramfs -u @@ -316,61 +347,17 @@ esac ###### link files # convenient to just do all file linking in one place -s lnf -T /a/bin /b -s lnf -T /nocow/t /t +s /a/exe/lnf -T /a/bin /b +s /a/exe/lnf -T /nocow/t /t if has_p; then lnf -T /p/News ~/News fi -s lnf /q/root/.editor-backups /q/root/.undo-tree-history \ +s /a/exe/lnf /q/root/.editor-backups /q/root/.undo-tree-history \ /a/opt /a/c/.emacs.d $HOME/mw_vars /k/backup /root -pi rsync # needed for rootsshsync -/a/bin/ds/install-my-scripts # needed for rootsshsync -rootsshsync -s lnf /a/c/.vim /a/c/.vimrc /a/c/.gvimrc /root -if has_p; then - # for dovecot - lnf -T /i/k/mboxes ~/mail -fi - +/a/bin/ds/install-my-scripts # needed for rootsshsync cronjob +s /a/exe/lnf /a/c/.vim /a/c/.vimrc /a/c/.gvimrc /root -##### install xinput -if has_x; then - case $(distro-name) in - trisquel|ubuntu|debian) - pi xinput - ;; - fedora) - pi xinput_calibrator - ;; - arch) - pi xorg-xinput - ;; - esac - - #### install redshift - case $(distro-name) in - trisquel|ubuntu|debian) - # recommends gets us geoclue (for darkening automatically at night i assume), - # which recommends modemmanager, which is annoying to fix for the model01 keyboard. - pi --no-install-recommends gtk-redshift - ;;& - fedora) - pi redshift-gtk - ;;& - arch) - pi redshift - ;;& - esac -fi - -if has_wayland; then - pi sway xwayland - # originally used xkbcomp, documented in input-setup.sh, this doesnt - # work under wayland, but its still useful for creating the config, - # then modifying the system files. - s sed -i.orig '/key * *{/,/}/s/KP_Multiply/underscore/g' /usr/share/X11/xkb/symbols/keypad -fi @@ -383,22 +370,12 @@ case $(distro-name) in ;; esac -#### fedora specific packages -case $(distro-name) in - fedora) - # todo, this could probably come later - p -y groupinstall development-tools c-development books admin-tools - pi man-pages - ;; - # other distros unknown -esac - #### enable trim # enable trim for volume delete, other rare commands sudo $sed -ri 's/( *issue_discards\b).*/\1 = 1/' /etc/lvm/lvm.conf if encrypted; then # flidas or so, these units arent built-in - if isdeb && ! systemctl list-unit-files | grep -xF fstrim.timer &>/dev/null ; then + if isdeb && ! systemctl list-unit-files | grep ^fstrim.timer &>/dev/null ; then sudo cp /usr/share/doc/util-linux/examples/fstrim.{service,timer} /etc/systemd/system fi # does weekly trim @@ -411,15 +388,15 @@ s mkdir -p "${dirs[@]}" s chown $USER:$USER "${dirs[@]}" ###### setup /i -tu /etc/fstab <<'EOF' +if home_network; then + tu /etc/fstab <<'EOF' /i/w /w none bind,noauto 0 0 /i/k /k none bind,noauto 0 0 EOF -if ! mountpoint /kr; then - s mkdir -p /kr - s chown $USER:user2 /kr -fi -if home_network; then + if ! mountpoint /kr; then + s mkdir -p /kr + s chown $USER:user2 /kr + fi if [[ $HOSTNAME == frodo ]]; then tu /etc/fstab <<'EOF' /k /kr none bind,noauto 0 0 @@ -429,26 +406,24 @@ EOF frodo:/k /kr nfs noauto 0 0 EOF fi -fi -s mkdir -p /q /i/{w,k} -for dir in /{i,w,k}; do - if mountpoint $dir; then continue; fi # already mounted - s mkdir -p $dir - s chown $USER:$USER $dir -done -# not needed for all hosts, but rather just keep it uniform -s mkdir -p /mnt/iroot -# debian auto mounting of multi-disk encrypted btrfs is busted. It is -# in jessie, and in stretch as of 11/26/2016 I have 4 disks in cryptab, -# based on 3 of those, it creates .device units for /dev/mapper/dev... -# then waits endlessly for them on bootup, after the /dev/mapper disks -# have already been created and exist. todo: create a simple repro -# for this in a vm and report it upstream. -if has_btrfs || home_network; then + s mkdir -p /q /i/{w,k} + for dir in /{i,w,k}; do + if mountpoint $dir; then continue; fi # already mounted + s mkdir -p $dir + s chown $USER:$USER $dir + done + # not needed for all hosts, but rather just keep it uniform + s mkdir -p /mnt/iroot + # debian auto mounting of multi-disk encrypted btrfs is busted. It is + # in jessie, and in stretch as of 11/26/2016 I have 4 disks in cryptab, + # based on 3 of those, it creates .device units for /dev/mapper/dev... + # then waits endlessly for them on bootup, after the /dev/mapper disks + # have already been created and exist. todo: create a simple repro + # for this in a vm and report it upstream. pi nfs-common s dd of=/root/imount <<'EOF' #!/bin/bash -[[ $EUID == 0 ]] || exec sudo -E "$BASH_SOURCE" "$@" +[[ $EUID == 0 ]] || exec sudo -E "${BASH_SOURCE[0]}" "$@" set -eE -o pipefail trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR for dir in /i /mnt/iroot /k /kr /w; do @@ -463,7 +438,6 @@ for dir in /i /mnt/iroot /k /kr /w; do done EOF s chmod +x /root/imount - s dd of=/etc/systemd/system/imount.service < *{/,/}/s/KP_Multiply/underscore/g' /usr/share/X11/xkb/symbols/keypad +fi + +##### basic graphical packages +if has_monitor; then + pi konsole suckless-tools fi -#### refix interactive ssh terminal -# the first pup command can kill off our /etc/ mod, so rerun this -/a/exe/ssh-emacs-setup +##### install emacs +if $emacs; then + if isarch; then + # emacs git build was broken last time i checked, + x=$(mktemp -d) + pushd $x + aurex emacs-git + makepkg -si --noconfirm + popd + rm -rf $x + pi hunspell hunspell-en + else + if $recompile; then + /a/bin/buildscripts/emacs + else + /a/bin/buildscripts/emacs --no-r + fi + fi + # the first pup command can kill off our /etc/ mod, so rerun this + /a/exe/ssh-emacs-setup +fi +echo 0 >~/.local/distro-begin echo "$0: $(date): ending now" exit 0