security stuff

[automated-distro-installer] / fai / config / distro-install-common / end

diff --git a/fai/config/distro-install-common/end b/fai/config/distro-install-common/end
index a6bc1137c56721a1eebee75080c4afd22b31188a..57b71159f62352228b8f53f28fb0b3ae89e138f8 100755 (executable)
--- a/fai/config/distro-install-common/end
+++ b/fai/config/distro-install-common/end
@@ -10,19 +10,19 @@ fi
 
 # ssh host keys
 # note, $BASH_SOURCE is not defined here under fai.
+
 src=$(dirname "$0")/p/c/machine_specific/$HOSTNAME/filesystem/etc/ssh
 dst=$target/etc/ssh
 if [[ -e $src && -e $dst ]]; then
-  # outside of fai context, we skip this
+  # outside of fai context or setting up a brand new host, we skip this
   cp -rT $src $dst
 fi
 
-TPW=/q/root/shadow/traci-simple
-if ifclass tp; then
-  ROOTPW=/q/root/shadow/standard
-  #    ROOTPW="$TPW"
-else
-  ROOTPW=/q/root/shadow/standard
+USER2PW=/q/root/shadow/user2
+# if doesn't exist, we dont set one
+ROOTPW=/q/root/shadow/standard
+if [[ ! -e $ROOTPW ]]; then
+  ROOTPW=/q/root/shadow/$HOSTNAME
 fi
 
 chpw() {
@@ -41,15 +41,16 @@ chpw() {
   fi
 }
 au() { # add user. i don't use adduser for portability
-  if ! $ROOTCMD getent passwd ${@: -1}; then
-    $ROOTCMD useradd -Um -s /bin/bash $@
+  local user=${@: -1}
+  if ! $ROOTCMD getent passwd $user; then
+    $ROOTCMD useradd -c $user -Um -s /bin/bash $@
   fi
 }
 
 chpw root "$ROOTPW"
 
 # only setup root pass for bootstrap vol
-if ifclass VOL_STRETCH_BOOTSTRAP; then
+if ifclass VOL_BULLSEYE_BOOTSTRAP; then
   exit 0
 fi
 
@@ -58,12 +59,12 @@ fi
 au iank
 chpw iank "$ROOTPW"
 
-au traci
+au user2
 if ifclass frodo; then
-  chpw traci "$TPW"
+  chpw user2 "$USER2PW"
 fi
-# comparing iank's groups to traci, I see none she should join on arch
-$ROOTCMD usermod -a -G traci iank
+# comparing iank's groups to user2, I see none she should join on arch
+$ROOTCMD usermod -a -G user2 iank
 
 
 $ROOTCMD getent group docker &>/dev/null || $ROOTCMD groupadd -r docker
@@ -75,29 +76,36 @@ $ROOTCMD usermod -a -G docker iank
 f=$target/etc/sysctl.d/99-sysctl.conf
 key=fs.inotify.max_user_watches
 if [[ -e $f ]]; then sed -ri --follow-symlinks "/^\s*$key\s*=/d" $f; fi
-echo "fs.inotify.max_user_watches = 1000000" >> $f
+echo "fs.inotify.max_user_watches = 50000" >> $f
 # applies it. it would be also be applied after a reboot
 $ROOTCMD sysctl --system
 
+cat >$target/etc/sudoers.d/ianksudoers <<'EOF'
+Defaults timestamp_timeout=1440
+# used in bashrc
+Defaults  env_keep += SUDOD
+# always_set_home
+# makes ubuntu be like debian
+# https://unix.stackexchange.com/a/91572
+Defaults always_set_home
+# umask: default setting is to have  minimum umask of 0022
+# This lets us have user-specific umasks which are more permissive.
+# I did this for transmission and set it's umask gecos on install,
+# see there for more info.
+Defaults !umask
+# i use sudo in cronjobs, it spams the logs rather uselessly
+# https://stackoverflow.com/questions/14277116/suppress-log-entry-for-single-sudo-commands
+Defaults:root,iank !log_allowed, !pam_session
+# for just the root user, set some env vars
+Defaults>root env_file=/etc/rootsudoenv
+EOF
+
+# remove old config line. can be removed eventually.
 f=$target/etc/sudoers
 line='iank  ALL=(ALL)  NOPASSWD: ALL'
-if [[ ! -e $f ]] || ! grep -xF "$line" $f; then
-  echo "$line" >> $f
-fi
-
-dir=/p/c/machine_specific/$HOSTNAME/.unison
-$ROOTCMD mkdir -p $dir
-if ! $ROOTCMD test -L /root/.unison; then
-  $ROOTCMD rm -rf /root/.unison
-  $ROOTCMD ln -s -T $dir /root/.unison
+if grep -qxF "$line" $f; then
+  sed -i "/^$line/d" $f
 fi
 
-$ROOTCMD chown -R 1000:1000 $dir
-while true; do
-  $ROOTCMD chown 1000:1000 $dir
-  $ROOTCMD chmod 700 $dir
-  dir=$(dirname $dir)
-  if [[ $dir == /p ]]; then break; fi
-done
 
 au --system -s /bin/false --home-dir /var/lib/bitcoind bitcoin