Author: tchemit Date: 2014-05-03 10:00:43 +0200 (Sat, 03 May 2014) New Revision: 63 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/63 Log: fix #4153 Modified: demo-tools/tomcat/apache-demo-ng demo-tools/tomcat/check-get-tomcat.sh demo-tools/tomcat/tomcat-default Modified: demo-tools/tomcat/apache-demo-ng =================================================================== --- demo-tools/tomcat/apache-demo-ng 2014-04-17 06:23:10 UTC (rev 62) +++ demo-tools/tomcat/apache-demo-ng 2014-05-03 08:00:43 UTC (rev 63) @@ -56,6 +56,8 @@ ErrorLog ${APACHE_LOG_DIR}/demo-ng-error.log CustomLog ${APACHE_LOG_DIR}/demo-ng-access.log combined + RewriteEngine On + # inclusion des fichiers de configuration pour chaque application, soit # globalement pour toutes les demo (latest, staging, stable) soit # individuellement @@ -75,6 +77,10 @@ # pour ne pas servir de proxy a la terre entiere ProxyRequests off + # exclude agrosyst stable and staging + ProxyPass /agrosyst-stable ! + ProxyPass /agrosyst-staging ! + ProxyPassMatch ^/(.*)-stable/?(.*)$ ajp://localhost:18971/$1-stable/$2 ProxyPassMatch ^/(.*)-staging/?(.*)$ ajp://localhost:18972/$1-staging/$2 ProxyPassMatch ^/(.*)-latest/?(.*)$ ajp://localhost:18973/$1-latest/$2 Modified: demo-tools/tomcat/check-get-tomcat.sh =================================================================== --- demo-tools/tomcat/check-get-tomcat.sh 2014-04-17 06:23:10 UTC (rev 62) +++ demo-tools/tomcat/check-get-tomcat.sh 2014-05-03 08:00:43 UTC (rev 63) @@ -17,6 +17,7 @@ DEBUG=false MIRROR=http://mirrors.linsrv.net/apache/tomcat +MIRROR=http://www.carfab.com/apachesoftware TARGET_DIR=/opt/repository LINK_DIR=/opt @@ -43,7 +44,7 @@ # @param $2 tomcat version 6, 7 or 8 getLastRelease () { local VERSION=$2 - local result=$(curl -s http://mirrors.linsrv.net/apache/tomcat/tomcat-$VERSION/ |grep "href=.v" |sed -re 's/.*>v([0-9]+.[0-9]+.[0-9]+).*/\1/') + local result=$(curl -s $MIRROR/tomcat/tomcat-$VERSION/ |grep "href=.v" |sed -re 's/.*>v([0-9]+.[0-9]+.[0-9]+).*/\1/') debug "last version is $result" eval $1=\$result } Modified: demo-tools/tomcat/tomcat-default =================================================================== --- demo-tools/tomcat/tomcat-default 2014-04-17 06:23:10 UTC (rev 62) +++ demo-tools/tomcat/tomcat-default 2014-05-03 08:00:43 UTC (rev 63) @@ -2,7 +2,7 @@ TOMCAT_GROUP=www-data JAVA_HOME=/opt/jdk JAVA_OPTS="-Djava.awt.headless=true -XX:+UseConcMarkSweepGC -Dfile.encoding=UTF-8" -JAVA_OPTS="$JAVA_OPTS -XX:MaxPermSize=400m -Xms512m -Xmx1024m -XX:-UseGCOverheadLimit" +JAVA_OPTS="$JAVA_OPTS -XX:MaxPermSize=512m -Xms512m -Xmx2048m -XX:-UseGCOverheadLimit" JTOMCAT_SECURITY=no LOGFILE_DAYS=30 JVM_TMP=/tmp/tomcat-temp