You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hawq.apache.org by wa...@apache.org on 2016/05/30 01:37:07 UTC
incubator-hawq git commit: fix RPM conflict between apache-tomcat and
pxf-service
Repository: incubator-hawq
Updated Branches:
refs/heads/master ec16d3162 -> d9d9a29bc
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/d9d9a29b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/d9d9a29b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/d9d9a29b
Branch: refs/heads/master
Commit: d9d9a29bc27e52d1dc4abcf941c22929c3e996dd
Parents: ec16d31
Author: Zhanwei Wang <wa...@wangzw.org>
Authored: Thu May 19 15:09:19 2016 +0800
Committer: Zhanwei Wang <wa...@wangzw.org>
Committed: Mon May 30 09:33:40 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/d9d9a29b/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/d9d9a29b/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*