Updated Branches: refs/heads/master 2218261eb -> 36f530290
BIGTOP-961. hcatalog should be re-using hive user when running Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/36f53029 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/36f53029 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/36f53029 Branch: refs/heads/master Commit: 36f53029034ceb0c6335baf237e171947a7a035e Parents: 2218261 Author: Roman Shaposhnik <[email protected]> Authored: Fri May 3 10:04:31 2013 -0700 Committer: Roman Shaposhnik <[email protected]> Committed: Fri May 3 10:04:31 2013 -0700 ---------------------------------------------------------------------- .../src/common/hcatalog/hcatalog-server.svc | 2 +- .../src/common/hcatalog/webhcat-server.svc | 2 +- bigtop-packages/src/deb/hcatalog/hcatalog.postinst | 4 +- bigtop-packages/src/deb/hcatalog/hcatalog.preinst | 50 --------------- .../src/rpm/hcatalog/SPECS/hcatalog.spec | 8 +-- .../src/main/resources/apt/package_data.xml | 9 --- .../src/main/resources/yum/package_data.xml | 9 --- .../src/main/resources/zypper/package_data.xml | 9 --- 8 files changed, 6 insertions(+), 87 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/36f53029/bigtop-packages/src/common/hcatalog/hcatalog-server.svc ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hcatalog/hcatalog-server.svc b/bigtop-packages/src/common/hcatalog/hcatalog-server.svc index 029f5b1..cd6d2b7 100644 --- a/bigtop-packages/src/common/hcatalog/hcatalog-server.svc +++ b/bigtop-packages/src/common/hcatalog/hcatalog-server.svc @@ -15,7 +15,7 @@ DAEMON="hcatalog-server" DESC="HCatalog server" EXEC_PATH="/usr/lib/hcatalog/sbin/hcat_server.sh" -SVC_USER="hcatalog" +SVC_USER="hive" DAEMON_FLAGS="" CONF_DIR="/etc/hcatalog/conf" # FIXME: HCATALOG-636 http://git-wip-us.apache.org/repos/asf/bigtop/blob/36f53029/bigtop-packages/src/common/hcatalog/webhcat-server.svc ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hcatalog/webhcat-server.svc b/bigtop-packages/src/common/hcatalog/webhcat-server.svc index 4d934c6..aff2a4d 100644 --- a/bigtop-packages/src/common/hcatalog/webhcat-server.svc +++ b/bigtop-packages/src/common/hcatalog/webhcat-server.svc @@ -15,7 +15,7 @@ DAEMON="webhcat-server" DESC="WEBHCat server" EXEC_PATH="/usr/lib/hcatalog/sbin/webhcat_server.sh" -SVC_USER="hcatalog" +SVC_USER="hive" DAEMON_FLAGS="" CONF_DIR="/etc/webhcat/conf" # FIXME: HCATALOG-636 http://git-wip-us.apache.org/repos/asf/bigtop/blob/36f53029/bigtop-packages/src/deb/hcatalog/hcatalog.postinst ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/hcatalog/hcatalog.postinst b/bigtop-packages/src/deb/hcatalog/hcatalog.postinst index b7d80ff..5873f74 100644 --- a/bigtop-packages/src/deb/hcatalog/hcatalog.postinst +++ b/bigtop-packages/src/deb/hcatalog/hcatalog.postinst @@ -20,8 +20,8 @@ case "$1" in configure) # Install config alternatives update-alternatives --install /etc/hcatalog/conf hcatalog-conf /etc/hcatalog/conf.dist 30 - chown hcatalog:hcatalog /var/run/hcatalog || : - chown hcatalog:hcatalog /var/log/hcatalog || : + chown hive:hive /var/run/hcatalog || : + chown hive:hive /var/log/hcatalog || : ;; abort-upgrade|abort-remove|abort-deconfigure) http://git-wip-us.apache.org/repos/asf/bigtop/blob/36f53029/bigtop-packages/src/deb/hcatalog/hcatalog.preinst ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/hcatalog/hcatalog.preinst b/bigtop-packages/src/deb/hcatalog/hcatalog.preinst deleted file mode 100644 index 31d76e6..0000000 --- a/bigtop-packages/src/deb/hcatalog/hcatalog.preinst +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh -# 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. -# -# preinst script for hcatalog -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * <new-preinst> `install' -# * <new-preinst> `install' <old-version> -# * <new-preinst> `upgrade' <old-version> -# * <old-preinst> `abort-upgrade' <new-version> -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - install|upgrade) - if ! getent passwd hcatalog >/dev/null; then - adduser \ - --system \ - --group \ - --home /var/run/hcatalog \ - --gecos "HCatalog User" \ - --shell /bin/false \ - hcatalog >/dev/null - fi - ;; - - abort-upgrade) - ;; - - *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 http://git-wip-us.apache.org/repos/asf/bigtop/blob/36f53029/bigtop-packages/src/rpm/hcatalog/SPECS/hcatalog.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/hcatalog/SPECS/hcatalog.spec b/bigtop-packages/src/rpm/hcatalog/SPECS/hcatalog.spec index f63e8fe..4fd8d23 100644 --- a/bigtop-packages/src/rpm/hcatalog/SPECS/hcatalog.spec +++ b/bigtop-packages/src/rpm/hcatalog/SPECS/hcatalog.spec @@ -182,10 +182,6 @@ fi %service_macro hcatalog-server %service_macro webhcat-server -%pre -getent group hcatalog >/dev/null || groupadd -r hcatalog || : -getent passwd hcatalog >/dev/null || useradd -c "HCatalog User" -s /sbin/nologin -g hcatalog -r -d /var/run/hcatalog hcatalog 2> /dev/null || : - %post %{alternatives_cmd} --install %{conf_hcatalog} hcatalog-conf %{conf_hcatalog}.dist 30 @@ -218,8 +214,8 @@ fi %{bin_hcatalog}/hcat %doc %{doc_hcatalog} %{man_dir}/man1/hcatalog.1.* -%attr(755,hcatalog,hcatalog) /var/run/hcatalog -%attr(755,hcatalog,hcatalog) /var/log/hcatalog +%attr(755,hive,hive) /var/run/hcatalog +%attr(755,hive,hive) /var/log/hcatalog %files -n webhcat %defattr(-,root,root,755) http://git-wip-us.apache.org/repos/asf/bigtop/blob/36f53029/bigtop-tests/test-artifacts/package/src/main/resources/apt/package_data.xml ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/package/src/main/resources/apt/package_data.xml b/bigtop-tests/test-artifacts/package/src/main/resources/apt/package_data.xml index 66b0629..73a9c98 100644 --- a/bigtop-tests/test-artifacts/package/src/main/resources/apt/package_data.xml +++ b/bigtop-tests/test-artifacts/package/src/main/resources/apt/package_data.xml @@ -82,15 +82,6 @@ </solr-server> </services> </solr-server> - <hcatalog> - <users> - <hcatalog> - <home>/var/lib/hcatalog</home> - <descr>HCatalog User</descr> - <shell>/bin/false</shell> - </hcatalog> - </users> - </hcatalog> <hcatalog-server> <services> <hcatalog-server> http://git-wip-us.apache.org/repos/asf/bigtop/blob/36f53029/bigtop-tests/test-artifacts/package/src/main/resources/yum/package_data.xml ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/package/src/main/resources/yum/package_data.xml b/bigtop-tests/test-artifacts/package/src/main/resources/yum/package_data.xml index 45ff956..2c88f75 100644 --- a/bigtop-tests/test-artifacts/package/src/main/resources/yum/package_data.xml +++ b/bigtop-tests/test-artifacts/package/src/main/resources/yum/package_data.xml @@ -101,15 +101,6 @@ </solr-server> </services> </solr-server> - <hcatalog> - <users> - <hcatalog> - <home>/var/run/hcatalog</home> - <descr>HCatalog User</descr> - <shell>/sbin/nologin</shell> - </hcatalog> - </users> - </hcatalog> <hcatalog-server> <services> <hcatalog-server> http://git-wip-us.apache.org/repos/asf/bigtop/blob/36f53029/bigtop-tests/test-artifacts/package/src/main/resources/zypper/package_data.xml ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/package/src/main/resources/zypper/package_data.xml b/bigtop-tests/test-artifacts/package/src/main/resources/zypper/package_data.xml index 38bc228..1d55dcd 100644 --- a/bigtop-tests/test-artifacts/package/src/main/resources/zypper/package_data.xml +++ b/bigtop-tests/test-artifacts/package/src/main/resources/zypper/package_data.xml @@ -100,15 +100,6 @@ </solr-server> </services> </solr-server> - <hcatalog> - <users> - <hcatalog> - <home>/var/run/hcatalog</home> - <descr>HCatalog User</descr> - <shell>/sbin/nologin</shell> - </hcatalog> - </users> - </hcatalog> <hcatalog-server> <services> <hcatalog-server>
