bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject [3/4] git commit: BIGTOP-1088. oozie packages need to own /etc/oozie/conf.dist/tomcat-deployment.{default, secure}
Date Tue, 24 Sep 2013 21:30:27 GMT
BIGTOP-1088. oozie packages need to own /etc/oozie/conf.dist/tomcat-deployment.{default,secure}


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/eb4d2b93
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/eb4d2b93
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/eb4d2b93

Branch: refs/heads/master
Commit: eb4d2b93519b8fd69ffb330ed867a3227e1bebfa
Parents: 09e0b39
Author: Roman Shaposhnik <rvs@cloudera.com>
Authored: Tue Sep 24 08:52:05 2013 -0700
Committer: Roman Shaposhnik <rvs@cloudera.com>
Committed: Tue Sep 24 08:54:07 2013 -0700

----------------------------------------------------------------------
 bigtop-packages/src/deb/oozie/oozie.postinst   | 3 ---
 bigtop-packages/src/deb/oozie/rules            | 3 +++
 bigtop-packages/src/rpm/oozie/SPECS/oozie.spec | 9 +++++----
 3 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/eb4d2b93/bigtop-packages/src/deb/oozie/oozie.postinst
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/oozie/oozie.postinst b/bigtop-packages/src/deb/oozie/oozie.postinst
index 11be70b..c572ded 100644
--- a/bigtop-packages/src/deb/oozie/oozie.postinst
+++ b/bigtop-packages/src/deb/oozie/oozie.postinst
@@ -42,11 +42,8 @@ case "$1" in
         update-alternatives --install /etc/oozie/conf oozie-conf /etc/oozie/conf.dist 30
 
         conf_tomcat=/etc/oozie/conf/tomcat-deployment
-        ln -s /usr/lib/oozie/webapps ${conf_tomcat}.default/
-        ln -s /usr/lib/oozie/webapps ${conf_tomcat}.secure/
         update-alternatives --install ${conf_tomcat} oozie-tomcat-conf ${conf_tomcat}.default
30
         update-alternatives --install ${conf_tomcat} oozie-tomcat-conf ${conf_tomcat}.secure
20
-        ln -s /var/lib/oozie/tomcat-deployment/WEB-INF /usr/lib/oozie/webapps/oozie/WEB-INF
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

http://git-wip-us.apache.org/repos/asf/bigtop/blob/eb4d2b93/bigtop-packages/src/deb/oozie/rules
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/oozie/rules b/bigtop-packages/src/deb/oozie/rules
index 531aeb2..4d74add 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 /usr/lib/oozie/webapps debian/oozie/etc/oozie/conf.dist/tomcat-deployment.default
+	ln -s /usr/lib/oozie/webapps debian/oozie/etc/oozie/conf.dist/tomcat-deployment.secure
+	ln -s /var/lib/oozie/tomcat-deployment/WEB-INF debian/oozie/usr/lib/oozie/webapps/oozie/WEB-INF

http://git-wip-us.apache.org/repos/asf/bigtop/blob/eb4d2b93/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 a546eb7..74c9d23 100644
--- a/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
+++ b/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
@@ -18,6 +18,7 @@
 %define conf_oozie %{_sysconfdir}/%{name}/conf
 %define conf_oozie_dist %{conf_oozie}.dist
 %define conf_tomcat %{conf_oozie}/tomcat-deployment
+%define conf_tomcat_dist %{conf_oozie_dist}/tomcat-deployment
 %define data_oozie /var/lib/oozie
 
 %if  %{!?suse_version:1}0
@@ -149,18 +150,18 @@ Requires: bigtop-utils >= 0.7
 %__install -d  -m 0755  %{buildroot}/%{_localstatedir}/log/oozie
 %__install -d  -m 0755  %{buildroot}/%{_localstatedir}/run/oozie
 
+%__ln_s -f %{lib_oozie}/webapps $RPM_BUILD_ROOT/%{conf_tomcat_dist}.default/webapps
+%__ln_s -f %{lib_oozie}/webapps $RPM_BUILD_ROOT/%{conf_tomcat_dist}.secure/webapps
+%__ln_s -f %{data_oozie}/tomcat-deployment/WEB-INF $RPM_BUILD_ROOT/%{lib_oozie}/webapps/oozie/WEB-INF
+
 %pre
 getent group oozie >/dev/null || /usr/sbin/groupadd -r oozie >/dev/null
 getent passwd oozie >/dev/null || /usr/sbin/useradd --comment "Oozie User" --shell /bin/false
-M -r -g oozie --home %{data_oozie} oozie >/dev/null
 
 %post 
 %{alternatives_cmd} --install %{conf_oozie} %{name}-conf %{conf_oozie_dist} 30
-
-ln -s /usr/lib/oozie/webapps %{conf_tomcat}.default/
-ln -s /usr/lib/oozie/webapps %{conf_tomcat}.secure/
 %{alternatives_cmd} --install %{conf_tomcat} %{name}-tomcat-conf %{conf_tomcat}.default 30
 %{alternatives_cmd} --install %{conf_tomcat} %{name}-tomcat-conf %{conf_tomcat}.secure 20
-ln -s /var/lib/oozie/tomcat-deployment/WEB-INF %{lib_oozie}/webapps/oozie/WEB-INF
 
 /sbin/chkconfig --add oozie 
 


Mime
View raw message