Repository: incubator-hawq Updated Branches: refs/heads/master 9c97bccfd -> 9b7f90b74
HAWQ-1079. Fixed issue with symlink. Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/9b7f90b7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/9b7f90b7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/9b7f90b7 Branch: refs/heads/master Commit: 9b7f90b744850ff83769c3a46e6d4daeb109cc68 Parents: 9c97bcc Author: Oleksandr Diachenko <odiache...@pivotal.io> Authored: Mon Sep 26 21:17:41 2016 -0700 Committer: Oleksandr Diachenko <odiache...@pivotal.io> Committed: Mon Sep 26 21:19:00 2016 -0700 ---------------------------------------------------------------------- pxf/build.gradle | 6 +-- pxf/pxf-service/src/scripts/post-install.sh | 40 ------------------- pxf/pxf-service/src/scripts/pre-install.sh | 49 ------------------------ pxf/pxf/src/scripts/post-install.sh | 40 +++++++++++++++++++ pxf/pxf/src/scripts/pre-install.sh | 49 ++++++++++++++++++++++++ 5 files changed, 92 insertions(+), 92 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/9b7f90b7/pxf/build.gradle ---------------------------------------------------------------------- diff --git a/pxf/build.gradle b/pxf/build.gradle index a35b35a..a66c586 100644 --- a/pxf/build.gradle +++ b/pxf/build.gradle @@ -213,9 +213,6 @@ project('pxf-service') { obsoletes('pxf-core') obsoletes('pxf-api') - preInstall file('src/scripts/pre-install.sh') - postInstall file('src/scripts/post-install.sh') - from('src/main/resources/pxf-profiles-default.xml') { fileType CONFIG | NOREPLACE into "/etc/pxf-${project.version}/conf" @@ -302,6 +299,9 @@ project('pxf') { requires(versionedPackageName('pxf-hbase'), project.version, GREATER | EQUAL) requires(versionedPackageName('pxf-json'), project.version, GREATER | EQUAL) + preInstall file('src/scripts/pre-install.sh') + postInstall file('src/scripts/post-install.sh') + link('/usr/lib/pxf', "/usr/lib/pxf-${project.version}") link('/etc/pxf', "/etc/pxf-${project.version}") link('/opt/pxf', "/opt/pxf-${project.version}") http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/9b7f90b7/pxf/pxf-service/src/scripts/post-install.sh ---------------------------------------------------------------------- diff --git a/pxf/pxf-service/src/scripts/post-install.sh b/pxf/pxf-service/src/scripts/post-install.sh deleted file mode 100644 index 799959e..0000000 --- a/pxf/pxf-service/src/scripts/post-install.sh +++ /dev/null @@ -1,40 +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 - -env_script=/etc/pxf/conf/pxf-env.sh -user=pxf -group=pxf - -# load pxf-env.sh script -if [ ! -f $env_script ]; then - echo WARNING: failed to find $env_script -else - source $env_script -fi - -# create log directory with necessary permission -mkdir -p $PXF_LOGDIR -chown $user:$group -R $PXF_LOGDIR -chmod 755 $PXF_LOGDIR - -# create run directory with necessary permission -mkdir -p $PXF_RUNDIR -chown $user:$group -R $PXF_RUNDIR -chmod 755 $PXF_RUNDIR http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/9b7f90b7/pxf/pxf-service/src/scripts/pre-install.sh ---------------------------------------------------------------------- diff --git a/pxf/pxf-service/src/scripts/pre-install.sh b/pxf/pxf-service/src/scripts/pre-install.sh deleted file mode 100644 index 964ae6a..0000000 --- a/pxf/pxf-service/src/scripts/pre-install.sh +++ /dev/null @@ -1,49 +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. - -# Pre installation script - -user=pxf -group=pxf -tcgroup=tomcat - -groupadd=/usr/sbin/groupadd -useradd=/usr/sbin/useradd -usermod=/usr/sbin/usermod - -if [ -f /etc/redhat-release ]; then - system=redhat -elif [ -f /etc/SuSE-release ]; then - system=suse -fi - -# Create system group hadoop if doesn't exist -getent group hadoop > /dev/null || $groupadd -r hadoop - -# Create system group pxf if doesn't exist -getent group $group > /dev/null || $groupadd -r $group - -# Create system user pxf if doens't exist -getent passwd $user > /dev/null || $useradd --comment "PXF service user" -M -r -g $group -G hadoop $user - -# Add pxf user to tomcat group so it can control the instance -if [ "$system" == "suse" ]; then - getent group $tcgroup > /dev/null && $usermod -A $tcgroup $user -else - getent group $tcgroup > /dev/null && $usermod -a -G $tcgroup $user -fi http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/9b7f90b7/pxf/pxf/src/scripts/post-install.sh ---------------------------------------------------------------------- diff --git a/pxf/pxf/src/scripts/post-install.sh b/pxf/pxf/src/scripts/post-install.sh new file mode 100644 index 0000000..481f926 --- /dev/null +++ b/pxf/pxf/src/scripts/post-install.sh @@ -0,0 +1,40 @@ +#!/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 + +env_script=/etc/pxf/conf/pxf-env.sh +user=pxf +group=pxf + +# load pxf-env.sh script +if [ ! -e $env_script ]; then + echo WARNING: failed to find $env_script +else + source $env_script +fi + +# create log directory with necessary permission +mkdir -p $PXF_LOGDIR +chown $user:$group -R $PXF_LOGDIR +chmod 755 $PXF_LOGDIR + +# create run directory with necessary permission +mkdir -p $PXF_RUNDIR +chown $user:$group -R $PXF_RUNDIR +chmod 755 $PXF_RUNDIR http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/9b7f90b7/pxf/pxf/src/scripts/pre-install.sh ---------------------------------------------------------------------- diff --git a/pxf/pxf/src/scripts/pre-install.sh b/pxf/pxf/src/scripts/pre-install.sh new file mode 100644 index 0000000..964ae6a --- /dev/null +++ b/pxf/pxf/src/scripts/pre-install.sh @@ -0,0 +1,49 @@ +#!/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. + +# Pre installation script + +user=pxf +group=pxf +tcgroup=tomcat + +groupadd=/usr/sbin/groupadd +useradd=/usr/sbin/useradd +usermod=/usr/sbin/usermod + +if [ -f /etc/redhat-release ]; then + system=redhat +elif [ -f /etc/SuSE-release ]; then + system=suse +fi + +# Create system group hadoop if doesn't exist +getent group hadoop > /dev/null || $groupadd -r hadoop + +# Create system group pxf if doesn't exist +getent group $group > /dev/null || $groupadd -r $group + +# Create system user pxf if doens't exist +getent passwd $user > /dev/null || $useradd --comment "PXF service user" -M -r -g $group -G hadoop $user + +# Add pxf user to tomcat group so it can control the instance +if [ "$system" == "suse" ]; then + getent group $tcgroup > /dev/null && $usermod -A $tcgroup $user +else + getent group $tcgroup > /dev/null && $usermod -a -G $tcgroup $user +fi
