#!/bin/bash -l
# Copyright (C) 2016 Ian Kelling
-# This program is under GPL v. 3 or later, see <http://www.gnu.org/licenses/>
-# todo. dunno why, but original bootstrap of timezone is not sticking.
-# fixed manually with:
-# s dpkg-reconfigure tzdata
-# enter 12 then 11.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+# http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
# 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
export HOSTNAME=$1
fi
-for f in iank-dev htpc treetowl x2 frodo tp li lj; do
+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_p() { treetowl || iank-dev || x2 || frodo || tp || demohost; }
has_x() { ! { lj || li; }; }
+linode() { lj || li; }
encrypted() { has_p; }
shopt -s extglob
# service that happens late in the game.
After=postfix.service
DefaultDependencies=no
+# not sure if needed, makes sure we shut down before reboot.target
Conflicts=reboot.target
[Service]
install-myqueue
if iank-dev; then
- desktop=$(ssh root@iankelling.org grep desktop /etc/hosts | grep -o "^.* ")
+ desktop=DESKTOP_DOMAIN # TODO, broken. rethink this next time it's used
if $bootstrapfs; then
- # for bootstrapping at a new job:
+ # TODO: broken. need to copy files in this directory too, probably rethink this.
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
if isfedora; then
# comment out line disallowing calling sudo in scripts
- sudo sed -i 's/^Defaults *requiretty/#\0 # ian commented/' /etc/sudoers
+ sudo sed -i --follow-symlinks '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 's/^\(SELINUX=\).*/\1disabled/' /etc/selinux/config
+ sudo sed -i --follow-symlinks '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"
EOF
}
-for x in /a/c/repos/bash/!(.git); do
+for x in /a/c/repos/bash/!(.git|..|.); do
lnf-home "$x"
sudo -i <<EOF
PATH="/a/exe:$PATH"
if isdebian; then
codename=$(debian-codename)
- # non-existent var, as Im not planning to use stable right now
- if isdebian-stable; then
- if has_x; then
- s dd of=/etc/apt/sources.list.d/mozilla-iceweasel.list <<EOF
+ if isdebian-stable && has_x; then
+ s dd of=/etc/apt/sources.list.d/mozilla-iceweasel.list <<EOF
deb http://mozilla.debian.net/ $codename-backports firefox-release
deb-src http://mozilla.debian.net/ $codename-backports firefox-release
EOF
- fi
-
- # we change the mirror from the default, so we cant use tu
- s dd of=/etc/apt/sources.list.d/main-backports.list <<EOF
-deb http://http.debian.net/debian $codename-backports main contrib non-free
-deb-src http://http.debian.net/debian $codename-backports main contrib non-free
-EOF
-
p update
# take care of mozilla signing errors in previous command
pi pkg-mozilla-archive-keyring
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
}
aurpi cower pacaur
- # for aur, automatically dl & add gpg keys.
- # Just the keyserver-options line goes in dirmngr.conf once
- # this bug is fixed: https://bugs.gnupg.org/gnupg/issue2147
- for homedir in /home/*; do
- # this creates ~/.gnupg. addgnupghome is kinda broken on arch.
- HOME=$homedir gpg -k
- teeu $homedir/.gnupg/gpg.conf <<EOF
-$(grep -o '^ *keyserver .*' $homedir/.gnupg/dirmngr.conf)
-keyserver-options auto-key-retrieve
-EOF
- done
pi pacserve
- x=$(mktemp); /a/opt/pacman.conf-insert_pacserve >$x
+
+ x=$(mktemp); /usr/bin/pacman.conf-insert_pacserve >$x
sudo dd of=/etc/pacman.conf if=$x; rm $x
sudo systemctl enable pacserve.service
sudo systemctl start pacserve.service
#s hostname -F /etc/hostname
#HOSTNAME=$(hostname)
-#########################################
-# NOTE: only /a needs to be mounted for creating links!
-###########################################
-# todo: reconcile ~/.ssh/config work/home
-s lnf -T /q/p /p
s lnf -T /a/bin /b
-conflink
if has_p; then
lnf -T /p/offlineimap ~/Maildir
s lnf /q/root/.editor-backups /q/root/.undo-tree-history \
/a/opt /a/c/.emacs.d $HOME/mw_vars /k/backup /root
-d=/q/p/c/machine_specific/$HOSTNAME/.unison
-if ! s test -L /root/.unison && [[ ! $(s find /root/.unison -prune -empty) ]]; then
- mkdir -p $d
- s chown -R $USER:$USER /root/.unison
- mv -f /root/.unison/* $d
-fi
-s lnf -T $d /root/.unison
-
-
rootsshsync
s lnf /a/c/.inputrc /a/c/.vim /a/c/.vimrc /a/c/.gvimrc /root
if isdebian-stable; then
pi firefox/$codename-backports
else
- pi firefox/unstable # has no unstable dependencies
+ # for a while, firefox/unstable had all it\'s deps satisfied
+ # by testing packages, but now i hit a conflict,
+ # it wanted a newer libfontconfig1, but emacs build-deps
+ # wanted an older one. Oh well, they seem to release
+ # a new esr version every 9 months or so.
+ pi firefox-esr
fi
fi
# for hosts which require nonfree drivers
- case $HOSTNAME in
- tp|x2) : ;;
- *) pi linux-image-amd64 firmware-linux-nonfree \
- firmware-linux-free linux-headers-amd64
- ;;
- esac
+ # i previously had extra packages listed here linux-image-amd64
+ # firmware-linux-free linux-headers-amd64, but I
+ # don\'t see any reason why. seems to work in testing without.
+ # remove this note if it continues to work.
+ p=firmware-linux-nonfree
+ if apt-cache show $p &>/dev/null; then
+ pi $p
+ fi
;;&
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)
;;&
ubuntu|debian|fedora)
if has_x; then
- pi xkbset
- fi
- ;;&
+ if isdebian-stable; then
+ pi xkbset
+ else
+ # xkbset was in testing for quite a while, dunno
+ # why it's not anymore. Sometime I should check and
+ # see if it's back in testing, but the unstable package
+ # doesn't upgrade anything form testing, and it's tiny
+ # so I'm not bothering to automate it.
+ pi xkbset/unstable
+fi
+fi
+;;&
esac
if has_x; 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.
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
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
+ 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