=== modified file 'dhis2-live-installer/resources/conf/hibernate.properties'
--- dhis2-live-installer/resources/conf/hibernate.properties 2011-03-03 18:29:05 +0000
+++ dhis2-live-installer/resources/conf/hibernate.properties 2011-03-06 09:31:18 +0000
@@ -1,4 +1,3 @@
-
# H2
#hibernate.dialect = org.hisp.dhis.dialect.H2Dialect
@@ -11,7 +10,7 @@
hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect
hibernate.connection.driver_class = org.postgresql.Driver
-hibernate.connection.url = jdbc:postgresql://localhost/dhis2db
+hibernate.connection.url = jdbc:postgresql:dhis2db
hibernate.connection.username = dhis2
hibernate.connection.password = dhis2
=== modified file 'dhis2-live-installer/resources/postgres/dhis2db.backup'
Binary files dhis2-live-installer/resources/postgres/dhis2db.backup 2011-03-03 18:29:05 +0000 and dhis2-live-installer/resources/postgres/dhis2db.backup 2011-03-06 09:31:18 +0000 differ
=== modified file 'dhis2-live-installer/resources/postgres/restore_db.bat'
--- dhis2-live-installer/resources/postgres/restore_db.bat 2011-03-03 18:29:05 +0000
+++ dhis2-live-installer/resources/postgres/restore_db.bat 2011-03-06 09:31:18 +0000
@@ -1,3 +1,4 @@
+SET PGPASSWORD=PG_PASSWORD
"c:\Program Files\PostgreSQL\9.0\bin\psql.exe" -c "CREATE USER dhis2 CREATEDB LOGIN PASSWORD 'dhis2';" -U postgres -w postgres
"c:\Program Files\Postgresql\9.0\bin\createdb.exe" -U postgres -w -O dhis2 dhis2db
"c:\Program Files\Postgresql\9.0\bin\pg_restore" -U postgres -w -d dhis2db dhis2db.backup
\ No newline at end of file
=== modified file 'dhis2-live-installer/src/bitrock/DHIS2_pginstaller.xml'
--- dhis2-live-installer/src/bitrock/DHIS2_pginstaller.xml 2011-03-03 18:29:05 +0000
+++ dhis2-live-installer/src/bitrock/DHIS2_pginstaller.xml 2011-03-06 09:31:18 +0000
@@ -210,14 +210,37 @@
+
+
+ pg_password
+ Postgresql Password
+ Please enter a password for the Postgresql superuser.
+
+
+ postgres
+ 1
+
+ 20
+
+
Installing Postgresql
postgresql-9.0.1-1-windows.exe
-
+ --unattendedmodeui none --superaccount postgres --servicepassword ${pg_password} --superpassword ${pg_password}
Installing Postgresql
${installdir}\tmp\
+
+ ${installdir}\tmp\restore_db.bat
+ regexp
+
+
+ PG_PASSWORD
+ ${pg_password}
+
+
+