diff --git a/dbtool.sh b/dbtool.sh index 3e0842b..274f7f0 100644 --- a/dbtool.sh +++ b/dbtool.sh @@ -2,4 +2,4 @@ CTSMS_PROPERTIES=${CTSMS_PROPERTIES:-/ctsms/properties} CTSMS_JAVA=${CTSMS_JAVA:-/ctsms/java} CATALINA_BASE=${CATALINA_BASE:-/var/lib/tomcat8} -java -DCTSMS_PROPERTIES="$CTSMS_PROPERTIES" -DCTSMS_JAVA="$CTSMS_JAVA" -Dfile.encoding=Cp1252 -Djava.awt.headless=true -Xms2048m -Xmx4096m -Xss256k -XX:+UseParallelGC -XX:MaxGCPauseMillis=1500 -XX:GCTimeRatio=9 -XX:+CMSClassUnloadingEnabled -XX:ReservedCodeCacheSize=256m -classpath $CATALINA_BASE/webapps/ROOT/WEB-INF/lib/ctsms-core-1.7.0.jar:$CATALINA_BASE/webapps/ROOT/WEB-INF/lib/* org.phoenixctms.ctsms.executable.DBTool $* \ No newline at end of file +java -DCTSMS_PROPERTIES="$CTSMS_PROPERTIES" -DCTSMS_JAVA="$CTSMS_JAVA" -Dfile.encoding=Cp1252 -Djava.awt.headless=true -Xms2048m -Xmx4096m -Xss256k -XX:+UseParallelGC -XX:MaxGCPauseMillis=1500 -XX:GCTimeRatio=9 -XX:+CMSClassUnloadingEnabled -XX:ReservedCodeCacheSize=256m -classpath $CATALINA_BASE/webapps/ROOT/WEB-INF/lib/ctsms-core-1.8.0.jar:$CATALINA_BASE/webapps/ROOT/WEB-INF/lib/* org.phoenixctms.ctsms.executable.DBTool $* \ No newline at end of file diff --git a/install.sh b/install.sh index 1b7ef3c..a7d3bcc 100644 --- a/install.sh +++ b/install.sh @@ -61,7 +61,7 @@ git clone https://github.com/phoenixctms/ctsms #sed -r -i 's/.+<\/stagingDirectory>/\/ctsms\/build\/ctsms\/target\/site<\/stagingDirectory>/' /ctsms/build/ctsms/pom.xml cd /ctsms/build/ctsms mvn install -DskipTests -if [ ! -f /ctsms/build/ctsms/web/target/ctsms-1.7.0.war]; then +if [ ! -f /ctsms/build/ctsms/web/target/ctsms-1.8.0.war]; then # maybe we have more luck with dependency download on a 2nd try: mvn install -DskipTests fi @@ -83,9 +83,9 @@ sudo -u ctsms psql -U ctsms ctsms < /ctsms/build/ctsms/core/db/index-create.sql #systemctl restart postgresql ###deploy ctsms-web.war -chmod 755 /ctsms/build/ctsms/web/target/ctsms-1.7.0.war +chmod 755 /ctsms/build/ctsms/web/target/ctsms-1.8.0.war rm /var/lib/tomcat8/webapps/ROOT/ -rf -cp /ctsms/build/ctsms/web/target/ctsms-1.7.0.war /var/lib/tomcat8/webapps/ROOT.war +cp /ctsms/build/ctsms/web/target/ctsms-1.8.0.war /var/lib/tomcat8/webapps/ROOT.war ###setup apache2 apt-get -y install apache2 libapache2-mod-jk libapache2-mod-fcgid @@ -292,10 +292,10 @@ cd /ctsms/bulk_processor/CTSMS/BulkProcessor/Projects/Render ./render.sh cd /ctsms/build/ctsms mvn -f web/pom.xml -Dmaven.test.skip=true -chmod 755 /ctsms/build/ctsms/web/target/ctsms-1.7.0.war +chmod 755 /ctsms/build/ctsms/web/target/ctsms-1.8.0.war systemctl stop tomcat8 rm /var/lib/tomcat8/webapps/ROOT/ -rf -cp /ctsms/build/ctsms/web/target/ctsms-1.7.0.war /var/lib/tomcat8/webapps/ROOT.war +cp /ctsms/build/ctsms/web/target/ctsms-1.8.0.war /var/lib/tomcat8/webapps/ROOT.war ###ready systemctl start tomcat8