# 
# 
# patch "install"
#  from [bd29592101ce4b7a0271986926af0afa80ef2baf]
#    to [9661f0019c52373e93029cedc5bb21e8d4b2d5dc]
# 
# patch "skel/monotonerc"
#  from [217345c5986195961026ca5651d142198aca7713]
#    to [059e15b2af7679b844df659b330b539d6c66d9cf]
# 
# patch "usher.cc"
#  from [eb45e37e4b15b1bff6183ad7e1f584b5d70040ac]
#    to [0c60b2b5903f873210ebeb5b18cf97122641b291]
# 
============================================================
--- install	bd29592101ce4b7a0271986926af0afa80ef2baf
+++ install	9661f0019c52373e93029cedc5bb21e8d4b2d5dc
@@ -46,6 +46,7 @@
 		cp hostconfig.dist $CONFDIR/hostconfig
 		cp skel/monotonerc $CONFDIR/
 		sed -i "s!DBROTATE!$BINDIR/update-viewmtn-db.sh!" $CONFDIR/monotonerc
+		sed -i "s!CONFDIR!$CONFDIR!" $CONFDIR/monotonerc
 		cp -r skel/keys $CONFDIR/
 		sed -i "s!HOSTNAME!$HOSTNAME!" $CONFDIR/hostconfig
 		sed -i "s!BASE_URL!http://$HOSTNAME/$NAME/!" $CONFDIR/hostconfig
============================================================
--- skel/monotonerc	217345c5986195961026ca5651d142198aca7713
+++ skel/monotonerc	059e15b2af7679b844df659b330b539d6c66d9cf
@@ -1,5 +1,5 @@
 function read_config()
-   local permfile = io.open(get_confdir() .. "/../../hostconfig", "r")
+   local permfile = io.open("CONFDIR/hostconfig", "r")
    if (permfile == nil) then return false end
    local dat = permfile:read("*a")
    io.close(permfile)
============================================================
--- usher.cc	eb45e37e4b15b1bff6183ad7e1f584b5d70040ac
+++ usher.cc	0c60b2b5903f873210ebeb5b18cf97122641b291
@@ -103,7 +103,7 @@
 namespace {
 
 string hostname;
-string serverdir;
+string project_dir;
 string dbstring;
 
 // defaults, overridden by command line
@@ -789,7 +789,7 @@
 void make_server(string const & name)
 {
   vector<string> hosts, patterns;
-  string projdir = serverdir + "/projects/" + name;
+  string projdir = project_dir + "/" + name;
   string desc = "-d " + projdir + "/database ";
   desc += "--confdir " + projdir + " *";
   hosts.push_back(name + "." + hostname);
@@ -1357,8 +1357,8 @@
       admins.insert(make_pair(user, pass));
     } else if(tok.s == "hostname") {
       hostname = readtok(cf).s;
-    } else if(tok.s == "serverdir") {
-      serverdir = readtok(cf).s;
+    } else if(tok.s == "project_dir") {
+      project_dir = readtok(cf).s;
     } else if(tok.s == "dbstring") {
       dbstring = readtok(cf).s;
     } else if(tok.s == "admin") {