svn commit: r1493166 - in /oozie/trunk: distro/src/main/bin/oozie-setup.sh release-log.txt

[rk...@apache.org]

Author: rkanter
Date: Fri Jun 14 17:17:49 2013
New Revision: 1493166

URL: http://svn.apache.org/r1493166
Log:
OOZIE-1414 Configuring Oozie for HTTPS still allows HTTP connections to all resources (rkanter)

Modified:
    oozie/trunk/distro/src/main/bin/oozie-setup.sh
    oozie/trunk/release-log.txt

Modified: oozie/trunk/distro/src/main/bin/oozie-setup.sh
URL: http://svn.apache.org/viewvc/oozie/trunk/distro/src/main/bin/oozie-setup.sh?rev=1493166&r1=1493165&r2=1493166&view=diff
==============================================================================
--- oozie/trunk/distro/src/main/bin/oozie-setup.sh (original)
+++ oozie/trunk/distro/src/main/bin/oozie-setup.sh Fri Jun 14 17:17:49 2013
@@ -238,13 +238,18 @@ else
   components=""
 
   if [ "${secure}" != "" ]; then
-    OPTIONS="${OPTIONS} -secureWeb ${secureConfigsDir}/ssl-web.xml"
     #Use the SSL version of server.xml in oozie-server
+    checkFileExists ${secureConfigsDir}/ssl-server.xml
     cp ${secureConfigsDir}/ssl-server.xml ${CATALINA_BASE}/conf/server.xml
-    echo "INFO: Using secure server.xml"
+    #Inject the SSL version of web.xml in oozie war
+    checkFileExists ${secureConfigsDir}/ssl-web.xml
+    cp ${secureConfigsDir}/ssl-web.xml ${tmpWarDir}/WEB-INF/web.xml
+    echo "INFO: Using secure server.xml and secure web.xml"
   else
     #Use the regular version of server.xml in oozie-server
+    checkFileExists ${secureConfigsDir}/server.xml
     cp ${secureConfigsDir}/server.xml ${CATALINA_BASE}/conf/server.xml
+    #No need to restore web.xml because its already in the original WAR file
   fi
 
   if [ "${addExtjs}" = "true" ]; then

Modified: oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1493166&r1=1493165&r2=1493166&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Fri Jun 14 17:17:49 2013
@@ -1,5 +1,6 @@
 -- Oozie 4.1.0 release (trunk - unreleased)
 
+OOZIE-1414 Configuring Oozie for HTTPS still allows HTTP connections to all resources (rkanter)
 OOZIE-1410 V2 servlets are missing from ssl-web.xml (rkanter, rohini via rkanter)
 OOZIE-1349 oozieCLI -Doozie.auth.token.cache doesn't work (bowenzhangusa via tucu)
 OOZIE-1398 Reduce the number of CLOB columns used (ryota)