various fixes

[distro-setup] / phabricator-setup

diff --git a/phabricator-setup b/phabricator-setup
index 25bbab7b22236f45dec14f07e4f4bec78883b785..2265591d2a473a3533fba6036792e467a7245ebd 100755 (executable)
--- a/phabricator-setup
+++ b/phabricator-setup
@@ -16,7 +16,7 @@
 
 
 # Automated phabricator setup. Not currently using it,
-# but it works.
+# but it worked last time I tried it.
 
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
@@ -50,8 +50,6 @@ fsetd() { fbin config set --database "$@"; }
 # phabricator complained about wanting arcanist first
 pi arcanist/unstable mercurial
 
-for x in /a/bin/bash_unpublished/*; do source $x; done
-
 # duplicated in mediawiki setup. todo fix that.
 s DEBIAN_FRONTEND=noninteractive pi mysql-server
 cd  # mysql_secure_installation writes some temp files to the current dir,
@@ -89,7 +87,7 @@ acme-tiny-wrapper $domain
 acme-tiny-wrapper $alt_domain
 
 for x in $domain $alt_domain; do
-    apache-site -r $webroot - $x <<EOF
+    web-conf -r $webroot - $x <<EOF
 RewriteEngine on
 RewriteRule ^/rsrc/(.*)     -                       [L,QSA]
 RewriteRule ^/favicon.ico   -                       [L,QSA]