HAWQ-743. Update gradle version and fixed permission handling in PXF tomcat dir
Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/8086a247 Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/8086a247 Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/8086a247 Branch: refs/heads/HAWQ-543 Commit: 8086a2470d89913ff7146d3bce515d78a3c89767 Parents: 752a98c Author: Shivram Mani <shivram.m...@gmail.com> Authored: Fri Jun 24 15:14:54 2016 -0700 Committer: Shivram Mani <shivram.m...@gmail.com> Committed: Fri Jun 24 15:14:54 2016 -0700 ---------------------------------------------------------------------- pxf/build.gradle | 8 ++++---- pxf/gradle/wrapper/gradle-wrapper.properties | 2 +- pxf/tomcat/src/scripts/post-install.sh | 21 --------------------- pxf/tomcat/src/scripts/pre-install.sh | 3 +++ 4 files changed, 8 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/8086a247/pxf/build.gradle ---------------------------------------------------------------------- diff --git a/pxf/build.gradle b/pxf/build.gradle index 00278aa..23d688f 100644 --- a/pxf/build.gradle +++ b/pxf/build.gradle @@ -474,14 +474,14 @@ 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 'root' - permissionGroup 'root' + user 'tomcat' + permissionGroup 'tomcat' + addParentDirs false into "/opt/pivotal/${tomcatName}" } - + link("/opt/pivotal/${packageName}", "${tomcatName}") } } http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/8086a247/pxf/gradle/wrapper/gradle-wrapper.properties ---------------------------------------------------------------------- diff --git a/pxf/gradle/wrapper/gradle-wrapper.properties b/pxf/gradle/wrapper/gradle-wrapper.properties index 9e56abb..ef410fd 100644 --- a/pxf/gradle/wrapper/gradle-wrapper.properties +++ b/pxf/gradle/wrapper/gradle-wrapper.properties @@ -20,4 +20,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-2.11-all.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-2.13-all.zip http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/8086a247/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 deleted file mode 100644 index 11783ec..0000000 --- a/pxf/tomcat/src/scripts/post-install.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/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* http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/8086a247/pxf/tomcat/src/scripts/pre-install.sh ---------------------------------------------------------------------- diff --git a/pxf/tomcat/src/scripts/pre-install.sh b/pxf/tomcat/src/scripts/pre-install.sh index a500f1f..0385c85 100644 --- a/pxf/tomcat/src/scripts/pre-install.sh +++ b/pxf/tomcat/src/scripts/pre-install.sh @@ -30,3 +30,6 @@ getent group $group > /dev/null || $groupadd -r $group # Create system user tomcat if doens't exist getent passwd $user > /dev/null || $useradd --comment "tomcat server user" -M -r -g $group $user + +# Create base directory +mkdir -p /opt/pivotal \ No newline at end of file