small fixes and update for webserver

[distro-setup] / distro-end

diff --git a/distro-end b/distro-end
index 2c638206b74f85476ce892899b7c0b49e377019c..897e4e95bd2bce1480f472091031ce6771410e2c 100755 (executable)
--- a/distro-end
+++ b/distro-end
@@ -213,7 +213,7 @@ esac
 # /usr/share/doc/unattended-upgrades# cat README.md
 # /etc/apt/apt.conf.d/50unattended-upgrades
 if isdebian; then
-    debian-setup-auto-update
+    setup-debian-auto-update
 fi
 
 # we've got a few dependencies later on, so install them now.
@@ -228,11 +228,10 @@ case $HOSTNAME in
             li) domain=iankelling.org ;;
         esac
         /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
-        $src/phab-setup
+        /a/h/build.rb
 
+        sudo -E /a/bin/mediawiki-setup/mw-setup-script
+        #$src/phab-setup
 
         echo "$0: $(date): ending now)"
         exit 0