Author: athimel Date: 2016-01-06 11:43:07 +0100 (Wed, 06 Jan 2016) New Revision: 135 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/135 Log: Disparition de tomcat6 Modified: demo-tools/tomcat/apache-demo-ng demo-tools/tomcat/tomcat-default demo-tools/tomcat/tomcat-init.d Modified: demo-tools/tomcat/apache-demo-ng =================================================================== --- demo-tools/tomcat/apache-demo-ng 2015-12-15 07:47:13 UTC (rev 134) +++ demo-tools/tomcat/apache-demo-ng 2016-01-06 10:43:07 UTC (rev 135) @@ -15,8 +15,9 @@ # les sous repertoires Options ExecCGI FollowSymLinks AllowOverride None - Order Deny,Allow - Allow from All +# Order Deny,Allow +# Allow from All + Require all granted AddHandler cgi-script .cgi </Directory> @@ -27,8 +28,9 @@ # index.html pour presenter l'application Options All AllowOverride All - Order Deny,Allow - Allow from All + Require all granted +# Order Deny,Allow +# Allow from All </Directory> <Directory /var/local/demo/app/*/*/> @@ -41,12 +43,12 @@ # (TODO: trouver la bonne config) # Order Deny,Allow # Deny from All + Require all denied </Directory> <Files ".apache.conf"> # on interdit la recuperation des fichiers inclus (.apache.conf) - Order Deny,Allow - Deny from All + Require all denied </Files> @@ -116,8 +118,9 @@ # les sous repertoires Options ExecCGI FollowSymLinks AllowOverride None - Order Deny,Allow - Allow from All +# Order Deny,Allow +# Allow from All + Require all granted AddHandler cgi-script .cgi </Directory> @@ -128,8 +131,9 @@ # index.html pour presenter l'application Options All AllowOverride All - Order Deny,Allow - Allow from All +# Order Deny,Allow +# Allow from All + Require all granted </Directory> <Directory /var/local/demo/app/*/*/> @@ -142,12 +146,14 @@ # (TODO: trouver la bonne config) # Order Deny,Allow # Deny from All + Require all denied </Directory> <Files ".apache.conf"> # on interdit la recuperation des fichiers inclus (.apache.conf) - Order Deny,Allow - Deny from All +# Order Deny,Allow +# Deny from All + Require all denied </Files> Modified: demo-tools/tomcat/tomcat-default =================================================================== --- demo-tools/tomcat/tomcat-default 2015-12-15 07:47:13 UTC (rev 134) +++ demo-tools/tomcat/tomcat-default 2016-01-06 10:43:07 UTC (rev 135) @@ -1,8 +1,10 @@ TOMCAT_USER=www-data TOMCAT_GROUP=www-data JAVA_HOME=/opt/jdk +DISPLAY=":1.0" JAVA_OPTS="-Djava.awt.headless=true -XX:+UseConcMarkSweepGC -Dfile.encoding=UTF-8" -JAVA_OPTS="$JAVA_OPTS -XX:MaxPermSize=512m -Xms512m -Xmx2048m -XX:-UseGCOverheadLimit" +#JAVA_OPTS="-XX:+UseConcMarkSweepGC -Dfile.encoding=UTF-8" +JAVA_OPTS="$JAVA_OPTS -XX:MaxPermSize=512m -Xms128m -Xmx2048m -XX:-UseGCOverheadLimit" JTOMCAT_SECURITY=no LOGFILE_DAYS=30 JVM_TMP=/tmp/tomcat-temp Modified: demo-tools/tomcat/tomcat-init.d =================================================================== --- demo-tools/tomcat/tomcat-init.d 2015-12-15 07:47:13 UTC (rev 134) +++ demo-tools/tomcat/tomcat-init.d 2016-01-06 10:43:07 UTC (rev 135) @@ -104,7 +104,7 @@ # It also looks like the default heap size of 64M is not enough for most cases # so the maximum heap size is set to 128M if [ -z "$JAVA_OPTS" ]; then - JAVA_OPTS="-Djava.awt.headless=true -Xmx128M" + JAVA_OPTS="-Djava.awt.headless=true" fi SECURITY="" @@ -297,7 +297,7 @@ fi ;; *) - log_failure_msg "Usage: $0 {start|stop|restart|try-restart|force-reload|status} {6|7|all} {stable|staging|latest|all}" + log_failure_msg "Usage: $0 {start|stop|restart|try-restart|force-reload|status} {7|8|all} {stable|staging|latest|all}" exit 1 ;; esac @@ -304,15 +304,15 @@ } if [ "$#" -lt 1 ]; then - log_failure_msg "Usage: $0 {start|stop|restart|try-restart|force-reload|status} {6|7|all (default)} {stable|staging|latest|all (default)}" + log_failure_msg "Usage: $0 {start|stop|restart|try-restart|force-reload|status} {7|8|all (default)} {stable|staging|latest|all (default)}" exit 1 fi # ACTION ACTION=$1 -# 6|7|8|all +# 7|8|all TOMCAT_VERSION=${2:-all} -TOMCAT_VERSION=${TOMCAT_VERSION/all/6 7 8} +TOMCAT_VERSION=${TOMCAT_VERSION/all/7 8} # stable|staging|latest|all TOMCAT_INSTANCE=${3:-all} TOMCAT_INSTANCE=${TOMCAT_INSTANCE/all/stable staging latest}