bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject [2/2] git commit: BIGTOP-1100. the new Tomcat deployment style would benefit from a few usability tweaks
Date Thu, 26 Sep 2013 22:57:03 GMT
BIGTOP-1100. the new Tomcat deployment style would benefit from a few usability tweaks


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

Branch: refs/heads/master
Commit: 077d35f2ec9d1cb3b76f226d295788a95f7d5b28
Parents: 621d57c
Author: Roman Shaposhnik <rvs@cloudera.com>
Authored: Thu Sep 26 10:14:33 2013 -0700
Committer: Roman Shaposhnik <rvs@cloudera.com>
Committed: Thu Sep 26 10:16:44 2013 -0700

----------------------------------------------------------------------
 bigtop-packages/src/common/hadoop/hadoop-httpfs.svc     | 2 +-
 bigtop-packages/src/common/oozie/oozie.init             | 1 +
 bigtop-packages/src/common/solr/solr-server.init.debian | 3 ++-
 bigtop-packages/src/common/sqoop/sqoop-server.sh        | 1 +
 bigtop-packages/src/rpm/solr/SOURCES/solr-server.init   | 3 ++-
 5 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/077d35f2/bigtop-packages/src/common/hadoop/hadoop-httpfs.svc
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hadoop/hadoop-httpfs.svc b/bigtop-packages/src/common/hadoop/hadoop-httpfs.svc
index 73a41e6..73507af 100644
--- a/bigtop-packages/src/common/hadoop/hadoop-httpfs.svc
+++ b/bigtop-packages/src/common/hadoop/hadoop-httpfs.svc
@@ -32,7 +32,7 @@ tomcat_deployment() {
   DEPLOYMENT_SOURCE=/etc/hadoop-httpfs/conf/tomcat-deployment
   DEPLOYMENT_TARGET=/var/lib/hadoop-httpfs/tomcat-deployment
 
-  rm -r ${DEPLOYMENT_TARGET}
+  rm -rf ${DEPLOYMENT_TARGET}
   cp -r ${DEPLOYMENT_SOURCE} ${DEPLOYMENT_TARGET}
   ln -s /usr/lib/hadoop-httpfs/webapps ${DEPLOYMENT_TARGET}/
   chown -R ${SVC_USER}:${SVC_USER} ${DEPLOYMENT_TARGET}

http://git-wip-us.apache.org/repos/asf/bigtop/blob/077d35f2/bigtop-packages/src/common/oozie/oozie.init
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/oozie/oozie.init b/bigtop-packages/src/common/oozie/oozie.init
index fd1bd78..321c4e6 100644
--- a/bigtop-packages/src/common/oozie/oozie.init
+++ b/bigtop-packages/src/common/oozie/oozie.init
@@ -53,6 +53,7 @@ tomcat_deployment() {
 
   rm -rf ${DEPLOYMENT_TARGET}
   cp -r ${DEPLOYMENT_SOURCE} ${DEPLOYMENT_TARGET}
+  chown -R oozie:oozie ${DEPLOYMENT_TARGET}
 }
 
 start_oozie() {

http://git-wip-us.apache.org/repos/asf/bigtop/blob/077d35f2/bigtop-packages/src/common/solr/solr-server.init.debian
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/solr/solr-server.init.debian b/bigtop-packages/src/common/solr/solr-server.init.debian
index c673603..c8195f6 100644
--- a/bigtop-packages/src/common/solr/solr-server.init.debian
+++ b/bigtop-packages/src/common/solr/solr-server.init.debian
@@ -68,9 +68,10 @@ tomcat_deployment() {
   DEPLOYMENT_SOURCE=/etc/solr/conf/tomcat-deployment
   DEPLOYMENT_TARGET=/var/lib/solr/tomcat-deployment
 
-  rm -r ${DEPLOYMENT_TARGET}
+  rm -rf ${DEPLOYMENT_TARGET}
   cp -r ${DEPLOYMENT_SOURCE} ${DEPLOYMENT_TARGET}
   ln -s ${SOLR_HOME}/server/webapps ${DEPLOYMENT_TARGET}/
+  chown -R ${SOLR_USER}:${SOLR_USER} ${DEPLOYMENT_TARGET}
 }
 
 start() {

http://git-wip-us.apache.org/repos/asf/bigtop/blob/077d35f2/bigtop-packages/src/common/sqoop/sqoop-server.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/sqoop/sqoop-server.sh b/bigtop-packages/src/common/sqoop/sqoop-server.sh
index ec825b2..7124dc6 100644
--- a/bigtop-packages/src/common/sqoop/sqoop-server.sh
+++ b/bigtop-packages/src/common/sqoop/sqoop-server.sh
@@ -23,6 +23,7 @@ tomcat_deployment() {
   cp -r ${DEPLOYMENT_SOURCE} ${DEPLOYMENT_TARGET}
   ln -s ${SQOOP_HOME}/webapps ${DEPLOYMENT_TARGET}/
   ln -s ${SQOOP_HOME}/bin ${DEPLOYMENT_TARGET}/
+  chown -R sqoop:sqoop ${DEPLOYMENT_TARGET}
 }
 
 # Autodetect JAVA_HOME if not defined

http://git-wip-us.apache.org/repos/asf/bigtop/blob/077d35f2/bigtop-packages/src/rpm/solr/SOURCES/solr-server.init
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/solr/SOURCES/solr-server.init b/bigtop-packages/src/rpm/solr/SOURCES/solr-server.init
index 28b26c8..374cc03 100644
--- a/bigtop-packages/src/rpm/solr/SOURCES/solr-server.init
+++ b/bigtop-packages/src/rpm/solr/SOURCES/solr-server.init
@@ -68,9 +68,10 @@ tomcat_deployment() {
   DEPLOYMENT_SOURCE=/etc/solr/conf/tomcat-deployment
   DEPLOYMENT_TARGET=/var/lib/solr/tomcat-deployment
 
-  rm -r ${DEPLOYMENT_TARGET}
+  rm -rf ${DEPLOYMENT_TARGET}
   cp -r ${DEPLOYMENT_SOURCE} ${DEPLOYMENT_TARGET}
   ln -s ${SOLR_HOME}/server/webapps ${DEPLOYMENT_TARGET}/
+  chown -R ${SOLR_USER}:${SOLR_USER} ${DEPLOYMENT_TARGET}
 }
 
 start() {


Mime
View raw message