# HG changeset patch
# User smith@nwoca.org
# Date 1449322031 0
# Node ID 42ab2045d76c0b6caa7a8cdfc118ae7a15d760ba
# Parent  72f33ca6aa5bda1cef78e4d7b56e614217e643f0
remove setting of admin password

diff -r 72f33ca6aa5b -r 42ab2045d76c tomcat/createTomcatAdmin.sh
--- a/tomcat/createTomcatAdmin.sh	Mon Sep 14 13:06:10 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-if [ -f /.tomcat_admin_created ]; then
-    echo "Tomcat 'admin' user already created"
-    exit 0
-fi
-
-#generate password
-PASS=$(TOMCAT_PASS: date | md5sum | head -c10)
-_word=$( [ ${TOMCAT_PASS} ] && echo "preset" || echo "random" )
-
-echo "=> Creating and admin user with a ${_word} password in Tomcat"
-sed -i -r 's/<\/tomcat-users>//' ${CATALINA_HOME}/conf/tomcat-users.xml
-echo '<role rolename="manager-gui"/>' >> ${CATALINA_HOME}/conf/tomcat-users.xml
-echo '<role rolename="manager-script"/>' >> ${CATALINA_HOME}/conf/tomcat-users.xml
-echo '<role rolename="manager-jmx"/>' >> ${CATALINA_HOME}/conf/tomcat-users.xml
-echo '<role rolename="admin-gui"/>' >> ${CATALINA_HOME}/conf/tomcat-users.xml
-echo '<role rolename="admin-script"/>' >> ${CATALINA_HOME}/conf/tomcat-users.xml
-echo "<user username=\"admin\" password=\"${PASS}\" roles=\"manager-gui,manager-script,manager-jmx,admin-gui, admin-script\"/>" >> ${CATALINA_HOME}/conf/tomcat-users.xml
-echo '</tomcat-users>' >> ${CATALINA_HOME}/conf/tomcat-users.xml 
-echo "=> Done!"
-touch /.tomcat_admin_created
-
-echo "========================================================================"
-echo "You can now configure to this Tomcat server using:"
-echo ""
-echo "    admin:${PASS}"
-echo ""
-echo "========================================================================"
diff -r 72f33ca6aa5b -r 42ab2045d76c tomcat/setenv.sh
--- a/tomcat/setenv.sh	Mon Sep 14 13:06:10 2015 +0100
+++ b/tomcat/setenv.sh	Sat Dec 05 13:27:11 2015 +0000
@@ -1,7 +1,5 @@
 #! /bin/sh
 #
-. "$CATALINA_HOME/bin/createTomcatAdmin.sh"
-#
 echo "__________________________________________"
 
 export CATALINA_OPTS="$CATALINA_OPTS -XX:+UseCompressedOops"