Mailing-List: contact commits-help@hawq.incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@hawq.incubator.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: wangzw@apache.org
To: commits@hawq.incubator.apache.org
Message-Id: <baf4cb7cf43f4c08b8b5fee11aa212f0@git.apache.org>
Subject: incubator-hawq git commit: HAWQ-743. fix RPM conflict between
 apache-tomcat and pxf-service [Forced Update!]
Date: Mon, 30 May 2016 01:46:31 +0000 (UTC)
archived-at: Mon, 30 May 2016 01:46:40 -0000

Repository: incubator-hawq
Updated Branches:
  refs/heads/master d9d9a29bc -> 2989326b0 (forced update)


HAWQ-743. fix RPM conflict between apache-tomcat and pxf-service


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/2989326b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/2989326b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/2989326b

Branch: refs/heads/master
Commit: 2989326b0fb129668fe28dce831480a8b20e4fe3
Parents: ec16d31
Author: Zhanwei Wang <wangzw@wangzw.org>
Authored: Thu May 19 15:09:19 2016 +0800
Committer: Zhanwei Wang <wangzw@wangzw.org>
Committed: Mon May 30 09:45:03 2016 +0800

----------------------------------------------------------------------
 pxf/build.gradle                       |  5 +++--
 pxf/tomcat/src/scripts/post-install.sh | 21 +++++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/2989326b/pxf/build.gradle
----------------------------------------------------------------------
diff --git a/pxf/build.gradle b/pxf/build.gradle
index eb716fc..00278aa 100644
--- a/pxf/build.gradle
+++ b/pxf/build.gradle
@@ -474,10 +474,11 @@ task tomcatRpm(type: Rpm) {
         permissionGroup = 'root'
 
         preInstall file('tomcat/src/scripts/pre-install.sh')
+        postInstall file('tomcat/src/scripts/post-install.sh')
 
         from("${tomcatTargetDir}/${tomcatName}") {
-            user 'tomcat'
-            permissionGroup 'tomcat'
+            user 'root'
+            permissionGroup 'root'
             into "/opt/pivotal/${tomcatName}"
         }
     

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/2989326b/pxf/tomcat/src/scripts/post-install.sh
----------------------------------------------------------------------
diff --git a/pxf/tomcat/src/scripts/post-install.sh b/pxf/tomcat/src/scripts/post-install.sh
new file mode 100644
index 0000000..11783ec
--- /dev/null
+++ b/pxf/tomcat/src/scripts/post-install.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# Post installation script
+
+chown -R tomcat:tomcat /opt/pivotal/apache-tomcat*