small fixes and update for webserver

[distro-setup] / distro-begin

diff --git a/distro-begin b/distro-begin
index a37a19b86006691e1229cd630bdd625795181042..222eb5ceca2ece5b8b9cccacce59bac8368b051e 100755 (executable)
--- a/distro-begin
+++ b/distro-begin
@@ -77,6 +77,7 @@ for f in iank-dev htpc treetowl x2 frodo tp li lj demohost; do
 done
 has_p() { iank-dev || x2 || frodo || tp; }
 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"
@@ -618,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