# 
# 
# patch "install"
#  from [bd29592101ce4b7a0271986926af0afa80ef2baf]
#    to [ecc1c4137cf410542a34e3d0263acb564cd55cc7]
# 
============================================================
--- install	bd29592101ce4b7a0271986926af0afa80ef2baf
+++ install	ecc1c4137cf410542a34e3d0263acb564cd55cc7
@@ -1,13 +1,16 @@
 #!/bin/sh
 
 WEBUSER=www-data
+WEBGROUP=www-data
 USHERUSER=www-data
+USHERGROUP=www-data
 NAME=webhost
 CONFDIR=/etc/$NAME
 PROJDIR=/var/lib/$NAME/projects
 GRAPHDIR=/var/cache/$NAME/graphs
 WWWDIR=/var/www/$NAME
 BINDIR=/usr/bin
+MONOTONE=/usr/bin/monotone
 
 HOSTNAME=$(hostname)
 
@@ -30,44 +33,53 @@
 	make usher.webhost
 	cp usher.webhost $BINDIR/
 	cp dbrotate.sh $BINDIR/update-viewmtn-db.sh
-	if [ ! -d /etc/$NAME ] || [ "$1" == "--force-conffiles" ]; then
-		if [ -d /etc/$NAME ]; then
+	if [ ! -d $CONFDIR ] || [ "$1" == "--force-conffiles" ]; then
+		if [ -d $CONFDIR ]; then
 			echo "Replacing your configuration..."
 		else
 			mkdir $CONFDIR/
 			dd if=/dev/random of=$CONFDIR/secfile bs=1 count=64
-			chgrp $WEBUSER $CONFDIR/secfile
+			chgrp $WEBGROUP $CONFDIR/secfile
 			chmod 0400 $CONFDIR/secfile
 		fi
 		if [ -f $CONFDIR/hostconfig ]; then
 			mv -v $CONFDIR/hostconfig $CONFDIR/hostconfig.old
 			echo "Your previous hostconfig file has been moved to hostconfig.old"
 		fi
-		cp hostconfig.dist $CONFDIR/hostconfig
-		cp skel/monotonerc $CONFDIR/
-		sed -i "s!DBROTATE!$BINDIR/update-viewmtn-db.sh!" $CONFDIR/monotonerc
-		cp -r skel/keys $CONFDIR/
-		sed -i "s!HOSTNAME!$HOSTNAME!" $CONFDIR/hostconfig
-		sed -i "s!BASE_URL!http://$HOSTNAME/$NAME/!" $CONFDIR/hostconfig
-		sed -i "s!PROJECT_DIR!$PROJDIR!" $CONFDIR/hostconfig
-		sed -i "s!GRAPH_DIR!$GRAPHDIR!" $CONFDIR/hostconfig
-		sed -i "s!WWW_DIR!$WWWDIR!" $CONFDIR/hostconfig
+
+		sed -e "s!DBROTATE!$BINDIR/update-viewmtn-db.sh!" \
+		    < skel/monotonerc > $CONFDIR/monotonerc
+
+		sed -e "s!HOSTNAME!$HOSTNAME!" \
+		    -e "s!MONOTONE!$MONOTONE!" \
+		    -e "s!BASE_URL!http://$HOSTNAME/$NAME/!" \
+		    -e "s!PROJECT_DIR!$PROJDIR!" \
+		    -e "s!GRAPH_DIR!$GRAPHDIR!" \
+		    -e "s!WWW_DIR!$WWWDIR!" \
+		    < hostconfig.dist > $CONFDIR/hostconfig
 		
-		cp webhost.initscript /etc/init.d/$NAME
-		sed -i "s!BINDIR!$BINDIR!" /etc/init.d/$NAME
-		sed -i "s!CONFDIR!$CONFDIR!" /etc/init.d/$NAME
-		sed -i "s!USHERUSER!$USHERUSER!" /etc/init.d/$NAME
+		sed -e "s!BINDIR!$BINDIR!" \
+		    -e "s!CONFDIR!$CONFDIR!" \
+		    -e "s!USHERUSER!$USHERUSER!" \
+		    < webhost.initscript > /etc/init.d/$NAME
 		
-		cp webhost.cronjob /etc/cron.daily/$NAME
-		sed -i "s!GRAPH_DIR!$GRAPHDIR!" /etc/cron.daily/$NAME
-		sed -i "s!CONFDIR!$CONFDIR'!" /etc/cron.daily/$NAME
+		sed -e "s!GRAPH_DIR!$GRAPHDIR!" \
+		    -e "s!CONFDIR!$CONFDIR'!" \
+		    < webhost.cronjob > /etc/cron.daily/$NAME
+
+		cp -r skel/keys $CONFDIR/
 	fi
 
-	sed -i "s!'CONFDIR'!'$CONFDIR'!" $WWWDIR/common.php
+	sed -e "s!'CONFDIR'!'$CONFDIR'!" \
+	    < $WWWDIR/common.php > $WWWDIR/common.php.new
+	mv $WWWDIR/common.php.new
+
 	if [ -f $WWWDIR/viewmtn/config.py.example ]; then
-		mv $WWWDIR/viewmtn/config.py.example $WWWDIR/viewmtn/config.py
+		sed -e "s!'CONFDIR'!'$CONFDIR'!" \
+		    < $WWWDIR/viewmtn/config.py.example \
+		    > $WWWDIR/viewmtn/config.py
+		rm $WWWDIR/viewmtn/config.py.example
 	fi
-	sed -i "s!'CONFDIR'!'$CONFDIR'!" $WWWDIR/viewmtn/config.py
 }
 
 do_install "$1"