use better practice to avoid overwriting symlnks

[distro-setup] / distro-end

diff --git a/distro-end b/distro-end
index 1f2c32453b7a199ef9a1e371b7ab11afbddef842..d24964a6a21e9f27b13001be894831aa01d63ba6 100755 (executable)
--- a/distro-end
+++ b/distro-end
@@ -78,9 +78,16 @@ esac
 
 
 
-########### begin section including lj ################
+########### begin section including li ################
 
 
+case $distro in
+    debian)
+        if [[ `debian-archive` == testing ]]; then
+            pi acme-tiny
+        fi
+esac
+
 case $distro in
     fedora) spa unrar ;;
     *) spa unrar-free ;;
@@ -196,10 +203,6 @@ if isdebian; then
     debian-setup-auto-update
 fi
 
-# cron
-/a/bin/crons/all
-
-
 case $HOSTNAME in
     lj|li)
 
@@ -208,7 +211,7 @@ case $HOSTNAME in
             lj) domain=iank.bid ;;
             li) domain=iankelling.org ;;
         esac
-        homepage-setup $domain
+        /a/h/setup.sh $domain
         s rld /a/h/_site/ /var/www/$domain/html
 
         curl https://$domain/git/?p=mediawiki-setup/.git;a=blob_plain;f=mw-setup-script;hb=HEAD | bash
@@ -402,13 +405,16 @@ case $HOSTNAME in
                 cd /a/opt
                 wget -nv -N https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
                 errallow
+                set -o pipefail
                 s dpkg -i google-chrome-stable_current_amd64.deb |& tee $log
                 code=$?
                 errcatch
                 case $code in
                     0) : ;;
                     *)
-                        if grep '^dpkg: dependency problems prevent configuration of' \
+                        # previously I had a more specific search, but dpkg
+                        # changed it's output as of 7/2016
+                        if grep 'dependency problems' \
                                 $log &>/dev/null; then
                             s apt-get -fy install
                         else
@@ -557,7 +563,7 @@ case $distro in
            bridge-utils dnsmasq qemu bind-tools
         # otherwise we get error about accessing kvm module.
         # seems like there might be a better way, but google was a bit vague.
-        s sed -ri '/^ *user *=/d' /etc/libvirt/qemu.conf
+        s sed -ri --follow-symlinks '/^ *user *=/d' /etc/libvirt/qemu.conf
         echo 'user = "root"' | s tee -a /etc/libvirt/qemu.conf
         # https://bbs.archlinux.org/viewtopic.php?id=206206
         # # this should prolly go in the wiki
@@ -748,7 +754,7 @@ pi smartmontools
 # -o on, turn on 4 hour period non-performance degrading testing.
 # short test daily 2-3am, extended tests Saturdays between 3-4am:
 sched="-s (S/../.././02|L/../../6/03)"
-s sed -i "s#^[[:space:]]*DEVICESCAN.*#\
+s sed -i --follow-symlinks "s#^[[:space:]]*DEVICESCAN.*#\
 DEVICESCAN -a -o on -S on -n standby,q $sched\
 -m ian@iankelling.org -M exec /usr/local/bin/smart-notify#" /etc/smartd.conf
 
@@ -758,7 +764,7 @@ DEVICESCAN -a -o on -S on -n standby,q $sched\
 # consulted first. This is often slower and undesirable, ie. local dns
 # queries go from 0ms to 10+ or 100+ ms. To reverse the ordering, you
 # can do:
-#sudo sed -i '/tun\*\|tap\*/d' /etc/resolvconf/interface-order
+#sudo sed -i --follow-symlinks '/tun\*\|tap\*/d' /etc/resolvconf/interface-order
 # however, this breaks dns lookup for hosts on the openvpn lan.
 # I can\'t figure out why hosts on the normal lan would not be
 # broken under the default ordering, except the host I was
@@ -769,6 +775,11 @@ DEVICESCAN -a -o on -S on -n standby,q $sched\
 ########### misc stuff
 
 
+if ! sudo test -e /etc/openvpn/client.key; then
+    /a/bin/vpn-setup/vpn-mk-client-cert
+fi
+
+
 case $distro in
     debian|ubuntu)
         case `debian-archive` in
@@ -1001,11 +1012,11 @@ case $distro in
 esac
 
 # add 2 lines after workgroup option
-s sed -ri '/^\s*encrypt passwords\s*=/d' /etc/samba/smb.conf
-s sed -ri '/^\s*map to guest\s*=/d' /etc/samba/smb.conf
-s sed -i 's/\(\s*workgroup\s*=\).*/\1 WORKGROUP\n\tencrypt passwords = yes\n\tmap to guest = bad password/'  /etc/samba/smb.conf
+s sed -ri --follow-symlinks '/^\s*encrypt passwords\s*=/d' /etc/samba/smb.conf
+s sed -ri --follow-symlinks '/^\s*map to guest\s*=/d' /etc/samba/smb.conf
+s sed -i --follow-symlinks 's/\(\s*workgroup\s*=\).*/\1 WORKGROUP\n\tencrypt passwords = yes\n\tmap to guest = bad password/'  /etc/samba/smb.conf
 # remove default homes section. not sharing that.
-s sed -ri '/^\s*\[homes\]/,/\s*\[/d' /etc/samba/smb.conf
+s sed -ri --follow-symlinks '/^\s*\[homes\]/,/\s*\[/d' /etc/samba/smb.conf
 
 if ! grep -xF '[public]' /etc/samba/smb.conf &>/dev/null; then
     s tee -a /etc/samba/smb.conf <<'EOF'