# 
# 
# patch "hostconfig.dist"
#  from [637eec02af474adccd53780f74cdd6dd364765f3]
#    to [4f0007567e3c414b7f514dc834c4e9c907a01643]
# 
# patch "install"
#  from [19388d8754a1d991a82f0f4832b97214f20a34f6]
#    to [8d334db6bc20eb5016eaccd674e97869eef1e7d2]
# 
============================================================
--- hostconfig.dist	637eec02af474adccd53780f74cdd6dd364765f3
+++ hostconfig.dist	4f0007567e3c414b7f514dc834c4e9c907a01643
@@ -1,6 +1,6 @@
 userpass "username" "password"
 adodb_path "/usr/share/adodb/adodb.inc.php" 
-dbstring "postgres://DBUSER:address@hidden/DBNAME"
+dbstring "postgres://DBUSER:address@hidden/DBNAME"
 odbc_dsn "ODBCDSN"
 admin "127.0.0.5:12345"
 
============================================================
--- install	19388d8754a1d991a82f0f4832b97214f20a34f6
+++ install	8d334db6bc20eb5016eaccd674e97869eef1e7d2
@@ -8,6 +8,7 @@
 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
@@ -123,6 +124,7 @@
 		    -e "s!DBHOST!$DBHOST!" \
 		    -e "s!DBNAME!$DBNAME!" \
 		    -e "s!DBUSER!$DBUSER!" \
+		    -e "s!DBPASS!$DBPASS!" \
 		    -e "s!MONOTONE!$MONOTONE!" \
 		    -e "s!BASE_URL!http://$HOSTNAME/$NAME/!" \
 		    -e "s!PROJECT_DIR!$PROJDIR!" \
@@ -164,8 +166,9 @@
 	if psql -c "\d" $DBNAME 2>/dev/null >/dev/null; then
 		:
 	else
-		createdb -O $WEBUSER $DBNAME
-		psql -f schema.sql $DBNAME
+		createuser -A -D -P DBUSER
+		createdb $DBNAME
+		sed -e "s!DBUSER!$DBUSER!" < schema.sql | psql -f- $DBNAME
 	fi
 }