Author: tchemit Date: 2014-07-11 18:03:35 +0200 (Fri, 11 Jul 2014) New Revision: 93 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/93 Log: fixes #5428: Install tomcat8 Modified: demo-tools/tomcat/check-get-tomcat.sh demo-tools/tomcat/deploy.cgi demo-tools/tomcat/tomcat-init.d Modified: demo-tools/tomcat/check-get-tomcat.sh =================================================================== --- demo-tools/tomcat/check-get-tomcat.sh 2014-07-04 13:15:32 UTC (rev 92) +++ demo-tools/tomcat/check-get-tomcat.sh 2014-07-11 16:03:35 UTC (rev 93) @@ -11,8 +11,8 @@ # - affiche le chemin des nouvelles instances mise en place si besoin # # l'administrateur devra alors faire un -# - /etc/init.d/tomcat stop [6|7] -# - /etc/init.d/tomcat start [6|7] +# - /etc/init.d/tomcat stop [6|7|8] +# - /etc/init.d/tomcat start [6|7|8] # DEBUG=false @@ -91,3 +91,4 @@ update 6 update 7 +update 8 \ No newline at end of file Modified: demo-tools/tomcat/deploy.cgi =================================================================== --- demo-tools/tomcat/deploy.cgi 2014-07-04 13:15:32 UTC (rev 92) +++ demo-tools/tomcat/deploy.cgi 2014-07-11 16:03:35 UTC (rev 93) @@ -60,7 +60,7 @@ else: TOMCAT_VERSION=7 else: - TOMCAT_VERSION_UNIVERSE = ['6','7'] + TOMCAT_VERSION_UNIVERSE = ['6','7','8'] if not TOMCAT_VERSION in TOMCAT_VERSION_UNIVERSE: print "<h1>TOMCAT_VERSION must be in %s but was <strong>%s</strong></h1>" % (TOMCAT_VERSION_UNIVERSE, TOMCAT_VERSION) sys.exit() Modified: demo-tools/tomcat/tomcat-init.d =================================================================== --- demo-tools/tomcat/tomcat-init.d 2014-07-04 13:15:32 UTC (rev 92) +++ demo-tools/tomcat/tomcat-init.d 2014-07-11 16:03:35 UTC (rev 93) @@ -310,9 +310,9 @@ # ACTION ACTION=$1 -# 6|7|all +# 6|7|8|all TOMCAT_VERSION=${2:-all} -TOMCAT_VERSION=${TOMCAT_VERSION/all/6 7} +TOMCAT_VERSION=${TOMCAT_VERSION/all/6 7 8} # stable|staging|latest|all TOMCAT_INSTANCE=${3:-all} TOMCAT_INSTANCE=${TOMCAT_INSTANCE/all/stable staging latest}