dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8329
committer: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-10-01 19:07:38 +0200
message:
  Minor alterations to Ubuntu setup script.
modified:
  resources/util/dhis2_create_ubuntu_instance.sh


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'resources/util/dhis2_create_ubuntu_instance.sh'
--- resources/util/dhis2_create_ubuntu_instance.sh	2012-10-01 14:08:57 +0000
+++ resources/util/dhis2_create_ubuntu_instance.sh	2012-10-01 17:07:38 +0000
@@ -54,7 +54,7 @@
 #Create a hibernate.properties file
 sudo -u $USERNAME sh -c "echo 'hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect
 hibernate.connection.driver_class = org.postgresql.Driver
-hibernate.connection.url = jdbc:postgresql://DB_HOSTNAME:$DB_PORT/$DBNAME
+hibernate.connection.url = jdbc:postgresql://$DB_HOSTNAME:$DB_PORT/$DBNAME
 hibernate.connection.username = $USERNAME
 hibernate.connection.password = $PASSWORD
 hibernate.hbm2ddl.auto = update' >  $BASE/dhis_home/hibernate.properties"
@@ -64,7 +64,8 @@
 #Create the JAVA_OPTS
 #TODO calculate this based on the free memory
 sudo sh -c "sudo -u $USERNAME echo -e \"export JAVA_OPTS='-Xmx1024m -Xms512m -XX:MaxPermSize=500m -XX:PermSize=400m'
-export DHIS2_HOME='$BASE/dhis_home'\" > $BASE/tomcat/bin/setenv.sh"
+export DHIS2_HOME='$BASE/dhis_home'
+export CATALINA_PID=$BASE/tomcat/work/test-tomcat.pid\" > $BASE/tomcat/bin/setenv.sh"
 
 #Start Tomcat
 sudo -u $USERNAME $BASE/tomcat/bin/startup.sh ;