small fixes and update for webserver

[distro-setup] / distro-begin

diff --git a/distro-begin b/distro-begin
index 5ffb0d288e3b4cf2fb161deaf19de67dc82bdc4e..222eb5ceca2ece5b8b9cccacce59bac8368b051e 100755 (executable)
--- a/distro-begin
+++ b/distro-begin
@@ -72,11 +72,12 @@ if [[ $1 ]]; then
     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_x() { ! { lj || li; }; }
+has_x() { ! { lj || li || demohost; }; }
+linode() { lj || li; }
 encrypted() { has_p; }
 
 shopt -s extglob
@@ -190,6 +191,11 @@ case $distro in
         ;;
 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"
@@ -263,6 +269,10 @@ EOF
     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
@@ -282,7 +292,8 @@ if isarch; then
     aurpi cower pacaur
 
     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
@@ -306,14 +317,8 @@ pi trash-cli
 #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
@@ -619,6 +624,7 @@ 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