# 
# 
# add_file "install-config.dist"
#  content [130ffd7399515635e741d74cfa7233fc21499486]
# 
# patch "install"
#  from [8d334db6bc20eb5016eaccd674e97869eef1e7d2]
#    to [46d518dc99b0a7bb698521b4a164f505b5390c19]
# 
============================================================
--- install-config.dist	130ffd7399515635e741d74cfa7233fc21499486
+++ install-config.dist	130ffd7399515635e741d74cfa7233fc21499486
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+WEBUSER=www-data
+WEBGROUP=www-data
+USHERUSER=www-data
+USHERGROUP=www-data
+NAME=webhost
+DBHOST=127.0.0.1
+DBNAME=webhost-db
+DBUSER=$WEBUSER
+DBPASS=dbpassword
+CONFDIR=/etc/$NAME
+PROJDIR=/var/lib/$NAME/projects
+GRAPHDIR=/var/cache/$NAME/graphs
+WWWDIR=/var/www/$NAME
+BINDIR=/usr/bin
+MONOTONE=/usr/bin/monotone
============================================================
--- install	8d334db6bc20eb5016eaccd674e97869eef1e7d2
+++ install	46d518dc99b0a7bb698521b4a164f505b5390c19
@@ -1,20 +1,12 @@
 #!/bin/sh
 
-WEBUSER=www-data
-WEBGROUP=www-data
-USHERUSER=www-data
-USHERGROUP=www-data
-NAME=webhost
-DBHOST=127.0.0.1
-DBNAME=webhost-db
-DBUSER=$WEBUSER
-DBPASS=dbpassword
-CONFDIR=/etc/$NAME
-PROJDIR=/var/lib/$NAME/projects
-GRAPHDIR=/var/cache/$NAME/graphs
-WWWDIR=/var/www/$NAME
-BINDIR=/usr/bin
-MONOTONE=/usr/bin/monotone
+if [ -f ./install-config ]; then
+	./install-config
+else
+	echo "You need to copy install-config.dist to install-config and edit the values,"
+	echo "then run this script again"
+	exit 1
+fi
 
 HOSTNAME=$(hostname)
 
@@ -137,6 +129,7 @@
 		    -e "s!CONFDIR!$CONFDIR!" \
 		    -e "s!USHERUSER!$USHERUSER!" \
 		    < webhost.initscript > /etc/init.d/$NAME.new
+		chmod a+x /etc/init.d/$NAME.new
 		install_file /etc/init.d/$NAME /bin/false
 		
 		sed -e "s!GRAPH_DIR!$GRAPHDIR!" \