BIGTOP-881. Add support for Oozie to be configured with SSL (HTTPS)
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/374cb2fe Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/374cb2fe Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/374cb2fe Branch: refs/heads/master Commit: 374cb2fe8bce56960a9dcad7fe44eff7b4058a08 Parents: bc11469 Author: Sean Mackrory <[email protected]> Authored: Mon Apr 15 13:16:59 2013 -0700 Committer: Roman Shaposhnik <[email protected]> Committed: Thu May 2 10:40:19 2013 -0700 ---------------------------------------------------------------------- bigtop-packages/src/common/oozie/install_oozie.sh | 11 ++++++++++- bigtop-packages/src/deb/oozie/rules | 3 +++ bigtop-packages/src/rpm/oozie/SPECS/oozie.spec | 5 +++++ 3 files changed, 18 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/374cb2fe/bigtop-packages/src/common/oozie/install_oozie.sh ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/oozie/install_oozie.sh b/bigtop-packages/src/common/oozie/install_oozie.sh index 5b260d6..7f67a1f 100755 --- a/bigtop-packages/src/common/oozie/install_oozie.sh +++ b/bigtop-packages/src/common/oozie/install_oozie.sh @@ -189,7 +189,7 @@ for i in `cd ${BUILD_DIR}/libtools ; ls *` ; do fi done -# Create an exploded-war oozie deployment in /var/lib/oozie +# Create an exploded-war oozie deployment in /usr/lib/oozie install -d -m 0755 ${SERVER_LIB_DIR}/oozie-server cp -R ${BUILD_DIR}/oozie-server/conf ${SERVER_LIB_DIR}/oozie-server/conf cp ${EXTRA_DIR}/context.xml ${SERVER_LIB_DIR}/oozie-server/conf/ @@ -198,3 +198,12 @@ ln -s ../webapps ${SERVER_LIB_DIR}/oozie-server/webapps # Provide a convenience symlink to be more consistent with tarball deployment ln -s ${DATA_DIR#${SERVER_PREFIX}} ${SERVER_LIB_DIR}/libext + +# Create an exploded-war oozie deployment in /usr/lib/oozie/oozie-server-ssl for SSL +cp -r ${SERVER_LIB_DIR}/oozie-server ${SERVER_LIB_DIR}/oozie-server-ssl +cp -r ${SERVER_LIB_DIR}/webapps ${SERVER_LIB_DIR}/webapps-ssl +rm -r ${SERVER_LIB_DIR}/oozie-server-ssl/webapps +ln -s ../webapps-ssl ${SERVER_LIB_DIR}/oozie-server-ssl/webapps +cp ${BUILD_DIR}/oozie-server/conf/ssl/ssl-server.xml ${SERVER_LIB_DIR}/oozie-server-ssl/conf/server.xml +cp ${BUILD_DIR}/oozie-server/conf/ssl/ssl-web.xml ${SERVER_LIB_DIR}/webapps-ssl/oozie/WEB-INF/web.xml + http://git-wip-us.apache.org/repos/asf/bigtop/blob/374cb2fe/bigtop-packages/src/deb/oozie/rules ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/oozie/rules b/bigtop-packages/src/deb/oozie/rules index 531aeb2..bb1e6c0 100755 --- a/bigtop-packages/src/deb/oozie/rules +++ b/bigtop-packages/src/deb/oozie/rules @@ -40,3 +40,6 @@ override_dh_auto_install: ln -s -f /var/lib/oozie/ext-2.2 debian/oozie/usr/lib/oozie/webapps/oozie/ext-2.2 rm -rf debian/oozie/usr/lib/oozie/webapps/oozie/docs ln -s -f /usr/share/doc/oozie debian/oozie/usr/lib/oozie/webapps/oozie/docs + ln -s -f /var/lib/oozie/ext-2.2 debian/oozie/usr/lib/oozie/webapps-ssl/oozie/ext-2.2 + rm -rf debian/oozie/usr/lib/oozie/webapps-ssl/oozie/docs + ln -s -f /usr/share/doc/oozie debian/oozie/usr/lib/oozie/webapps-ssl/oozie/docs http://git-wip-us.apache.org/repos/asf/bigtop/blob/374cb2fe/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec b/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec index 12ffd19..4bbc212 100644 --- a/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec +++ b/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec @@ -142,6 +142,9 @@ Requires: bigtop-utils >= 0.6 %__ln_s -f %{data_oozie}/ext-2.2 $RPM_BUILD_ROOT/%{lib_oozie}/webapps/oozie/ext-2.2 %__rm -rf $RPM_BUILD_ROOT/%{lib_oozie}/webapps/oozie/docs %__ln_s -f %{doc_oozie} $RPM_BUILD_ROOT/%{lib_oozie}/webapps/oozie/docs +%__ln_s -f %{data_oozie}/ext-2.2 $RPM_BUILD_ROOT/%{lib_oozie}/webapps-ssl/oozie/ext-2.2 +%__rm -rf $RPM_BUILD_ROOT/%{lib_oozie}/webapps-ssl/oozie/docs +%__ln_s -f %{doc_oozie} $RPM_BUILD_ROOT/%{lib_oozie}/webapps-ssl/oozie/docs %__install -d -m 0755 $RPM_BUILD_ROOT/usr/bin @@ -177,10 +180,12 @@ fi %{lib_oozie}/bin/oozied.sh %{lib_oozie}/bin/ooziedb.sh %{lib_oozie}/webapps +%{lib_oozie}/webapps-ssl %{lib_oozie}/libtools %{lib_oozie}/libserver %{lib_oozie}/oozie-sharelib.tar.gz %{lib_oozie}/oozie-server +%{lib_oozie}/oozie-server-ssl %{lib_oozie}/libext %{initd_dir}/oozie %defattr(-, oozie, oozie)
