# limitations under the License.
-# todo. dunno why, but original bootstrap of timezone is not sticking.
-# fixed manually with:
-# s dpkg-reconfigure tzdata
-# enter 12 then 11.
# for bootstrapping a new machine
-# to make ssh run better, first run this:
+# in case we need it,
+# to make ssh interactive shell run better, we run this first.
sudo bash -c 'source /a/c/repos/bash/.bashrc && source /a/exe/ssh-emacs-setup'
-# see t.org for OS installer notes
-
-# usage: $0 [OPTIONS] HOSTNAME
+# usage: $0 [-r] HOSTNAME
# tips:
# run any sudo command first so your pass is cached
fi
fi
-interactive=false # set this to true if running by hand in emacs
+interactive=true # set this to false to force set -x
[[ $- == *i* ]] || interactive=false
if ! $interactive; then
bootstrapfs=false # old flag, needs new look before using.
while [[ $1 == -* ]]; do
case $1 in
- # avoid some of the longer compilation steps,
- # when we need to rerun because we had an error
-r) recompile=true; shift ;;
esac
done
for f in iank-dev htpc treetowl x2 frodo tp li lj demohost; do
eval "$f() { [[ $HOSTNAME == $f ]]; }"
done
-has_p() { iank-dev || x2 || frodo || tp; }
-has_x() { ! { lj || li || demohost; }; }
+has_p() { treetowl || iank-dev || x2 || frodo || tp || demohost; }
+has_x() { ! { lj || li; }; }
+linode() { lj || li; }
encrypted() { has_p; }
shopt -s extglob
####### end command line parsing
PATH="/a/exe:$PATH"
+sed="sed --follow-symlinks"
+
+##### begin setup encryption scripts ######
if encrypted; then
# I tried making a service which was dependent on reboot.target,
# but it happened too late in the shutdown process.
sudo systemctl enable keyscriptoff.service
sudo systemctl start keyscriptoff.service
fi
+##### end setup encryption scripts ######
install-myqueue
-if iank-dev; then
- desktop=$(ssh root@iankelling.org grep desktop /etc/hosts | grep -o "^.* ")
- if $bootstrapfs; then
- # for bootstrapping at a new job:
- cp="scp $desktop:"
- # for moving to a new hd, change $cp to move between filesystems
- mkdir -p /a/bin
- chown -R ian:ian /a # probably needs to be removed
- $cp/a/c /a
- $cp/a/c/bin/{bash-programs-by-ian,distro-begin,distro-functions,input-setup.sh} /a/bin
- echo -e \\n\\n\\n | ssh-keygen -t rsa
- fi
-fi
-
# this script has been designed to be idempotent
# todo, it would be nice to cut down on some of the output
set +x
source /a/bin/distro-functions/src/identify-distros
$interactive || set -x
-echo path:$PATH
-
if isfedora; then
# comment out line disallowing calling sudo in scripts
- sudo sed -i --follow-symlinks 's/^Defaults *requiretty/#\0 # ian commented/' /etc/sudoers
+ sudo $sed -i 's/^Defaults *requiretty/#\0 # ian commented/' /etc/sudoers
# turn on magic sysrq commands for this boot cycle
echo 1 > sudo dd of=/proc/sys/kernel/sysrq
# 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 --follow-symlinks 's/^\(SELINUX=\).*/\1disabled/' /etc/selinux/config
+ sudo $sed -i 's/^\(SELINUX=\).*/\1disabled/' /etc/selinux/config
selinuxenabled && sudo setenforce 0
fi
;;
esac
+if linode; then
+ sudo $sed -i '/^127\.0\.1\.1/d' /etc/hosts
+ echo "127.0.1.1 $HOSTNAME.lan $HOSTNAME" | sudo tee -a /etc/hosts
+fi
+
if [[ $EUID == 0 ]]; then
echo "$0: running as root. exiting now that users are setup"
fi
-# link files
-
-lnf-home() {
- # $2 and opts are unused so far.
- opts=()
- while [[ $1 == -* ]]; do
- opts+=($1)
- shift
- done
- lnf ${opts[@]} "$1" /home/ian/$2
+#### begin link bashrc repo for all users ######
+for x in /a/c/repos/bash/!(.git|..|.); do
+ lnf "$x" /home/ian
sudo -u traci -i <<EOF
PATH="/a/exe:$PATH"
-lnf ${opts[@]} "$1" /home/traci/$2
+lnf "$x" /home/traci
EOF
-}
-
-for x in /a/c/repos/bash/!(.git); do
- lnf-home "$x"
sudo -i <<EOF
PATH="/a/exe:$PATH"
lnf $x /root
EOF
done
+#### end link bashrc repo for all users ######
-echo path:$PATH
set +x
errallow
source ~/.bashrc
-echo path:$PATH
$interactive || errcatch
$interactive || set -x
isfedora && tu /etc/sysctl.conf 'kernel.sysrq = 1'
+s lnf -T /q/p /p
+# this needs to be before installing pacserve so we have gpg conf.
+conflink
if isdebian; then
codename=$(debian-codename)
fi
fi
-s lnf -T /q/p /p
-# this needs to be before installing pacserve so we have gpg conf.
-conflink
-
if isarch; then
#https://wiki.archlinux.org/index.php/Arch_User_Repository#Installing_packages
sudo pacman -S --noconfirm --needed base-devel jq
;;&
ubuntu|debian)
if has_x; then
- pi xmacro gtk-redshift xinput
+ if isdebian-stable; then
+ pi xmacro
+ else
+ pi xmacro/unstable # has no unstable deps
+ fi
+ pi gtk-redshift xinput
fi
;;&
fedora)
fi
pi cryptsetup lvm2
# enables trim for volume delete, other rare commands.
-sudo sed -ri 's/( *issue_discards\b).*/\1 = 1/' /etc/lvm/lvm.conf
+sudo $sed -ri 's/( *issue_discards\b).*/\1 = 1/' /etc/lvm/lvm.conf
if encrypted; then
if isdeb; then
if [[ $HOSTNAME == treetowl ]]; then
tu /etc/fstab <<'EOF'
-UUID=3f7b31cd-f299-40b4-a86b-7604282e2715 /i btrfs noatime 0 2
+/dev/disk/by-id/ata-TOSHIBA_MD04ACA500_84REK6NTFS9A-part1 /i btrfs noatime,subvol=i 0 0
EOF
else
tu /etc/fstab <<'EOF'
/i/k /k none bind 0 0
EOF
-if ! mountpoint /kfrodo; then
- s mkdir -p /kfrodo
- s chown ian:traci /kfrodo
+if ! mountpoint /kr; then
+ s mkdir -p /kr
+ s chown ian:traci /kr
fi
-if [[ $HOSTNAME == frodo ]]; then
+if [[ $HOSTNAME == treetowl ]]; then
tu /etc/fstab <<'EOF'
-/k /kfrodo none bind 0 0
+/k /kr none bind 0 0
EOF
else
tu /etc/fstab <<'EOF'
-frodo:/k /kfrodo nfs defaults 0 0
+treetowl:/k /kr nfs defaults 0 0
EOF
fi
# work desktop doesnt need gpg stuff, but it doesnt hurt
s dd of=/etc/profile.d/environment.sh <<'EOF'
# IAN: EDIT THIS FROM /a/bin/distro-setup/distro-begin
+export ACME_TINY_WRAPPER_CERT_DIR=/p/c/machine_specific/$HOSTNAME/webservercerts
if [ -f $HOME/path_add-function ]; then
. $HOME/path_add-function
s dd of=/etc/default/apport <<<'enabled=0'
fi
+# fai sets this an old way that doesn't work for stretch.
+# no harm in setting it universally here.
+# using debconf-set-selection, the area gets reset to ETC
+# on my linode test machine after doing a dpkg-reconfigure, or a reinstall,
+# so we are using expect :(
+s apt-get -y install --no-install-recommends expect
+s expect <<EOF
+set force_conservative 0
+spawn dpkg-reconfigure tzdata -freadline
+expect -nocase timeout {exit 1} "Geographic area:"
+send "12\r"
+expect -nocase timeout {exit 1} "Time zone:"
+send "11\r"
+expect eof
+exit
+EOF
+
+
if has_x; then
if isarch; then
# install so it's build dependencies don't get removed.
fi
pi hunspell hunspell-en
else
- # to disable emacs git build,
- # s apt-get install emacs
if $recompile; then
- /a/bin/buildscripts/emacs -u
+ /a/bin/buildscripts/emacs
else
- /a/bin/buildscripts/emacs -r
+ /a/bin/buildscripts/emacs --no-r || /a/bin/buildscripts/emacs
fi
fi
dir=/etc/gdm
fi
s mkdir -p $dir/PostLogin
- s command cp /a/bin/desktop-20-autostart.sh $dir/PostLogin/Default
+ s command cp /a/bin/distro-setup/desktop-20-autostart.sh $dir/PostLogin/Default
s mkdir /etc/lightdm/lightdm.conf.d
s dd of=/etc/lightdm/lightdm.conf.d/12-ian.conf <<'EOF'
[SeatDefaults]
-session-setup-script=/a/bin/desktop-20-autostart.sh
+session-setup-script=/a/bin/distro-setup/desktop-20-autostart.sh
EOF
fi
# https://wiki.archlinux.org/index.php/Xinitrc
for homedir in /home/*; do
cp /etc/X11/xinit/xinitrc $homedir/.xinitrc
- sed -ri '/^ *twm\b/,$d' $homedir/.xinitrc
- echo "source /a/bin/xinitrc" | tee -a $homedir/.xinitrc
+ $sed -ri '/^ *twm\b/,$d' $homedir/.xinitrc
+ tee -a $homedir/.xinitrc <<'EOF'
+/a/bin/desktop-20-autostart.sh
+xsetroot -cursor_name left_ptr
+exec xmonad
+EOF
done
else
pi suckless-tools
fi
fi
-# the first pup command can kill off our /etc/
-/a/bin/ssh-emacs-setup
+# the first pup command can kill off our /etc/ mod, so rerun this
+/a/exe/ssh-emacs-setup
echo "$0: $(date): ending now"
iankelling.org / git / distro-setup / blobdiff