[bigtop] branch master updated: BIGTOP-3790: Add symlink for Tez conf dir (#990)

[sekikn]

This is an automated email from the ASF dual-hosted git repository.

sekikn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git


The following commit(s) were added to refs/heads/master by this push:
     new 31694c73 BIGTOP-3790: Add symlink for Tez conf dir (#990)
31694c73 is described below

commit 31694c73785c0dd2145ba242f874c7c19e4b1aff
Author: Zhiguo Wu <wuzhi...@apache.org>
AuthorDate: Mon Sep 12 10:31:23 2022 +0800

    BIGTOP-3790: Add symlink for Tez conf dir (#990)
    
    * BIGTOP-3790: Add symlink for tez conf dir
    
    * doc tez dir changes
---
 bigtop-packages/src/common/tez/install_tez.sh |  9 ++++++---
 bigtop-packages/src/rpm/tez/SPECS/tez.spec    | 14 ++++++++++++--
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/bigtop-packages/src/common/tez/install_tez.sh 
b/bigtop-packages/src/common/tez/install_tez.sh
index 47ff2797..c6d2b5ed 100644
--- a/bigtop-packages/src/common/tez/install_tez.sh
+++ b/bigtop-packages/src/common/tez/install_tez.sh
@@ -98,7 +98,9 @@ done
 MAN_DIR=${MAN_DIR:-/usr/share/man/man1}
 DOC_DIR=${DOC_DIR:-/usr/share/doc/tez}
 LIB_DIR=${LIB_DIR:-/usr/lib/tez}
-CONF_DIR=${CONF_DIR:-/etc/tez/conf}
+
+CONF_DIR=/etc/tez/conf
+CONF_DIST_DIR=/etc/tez/conf.dist/
 
 install -d -m 0755 $PREFIX/$MAN_DIR
 gzip -c tez.1 > $PREFIX/$MAN_DIR/tez.1.gz
@@ -106,12 +108,13 @@ gzip -c tez.1 > $PREFIX/$MAN_DIR/tez.1.gz
 install -d -m 0755 $PREFIX/$LIB_DIR
 install -d -m 0755 $PREFIX/$LIB_DIR/lib
 install -d -m 0755 $PREFIX/$DOC_DIR
-install -d -m 0755 $PREFIX/$CONF_DIR
+install -d -m 0755 $PREFIX/$CONF_DIST_DIR
 install -d -m 0755 $PREFIX/$MAN_DIR
 
 tar -C $PREFIX/$LIB_DIR -xzf $BUILD_DIR/tez-dist/target/tez*-minimal.tar.gz
 
-cp tez-site.xml $PREFIX/$CONF_DIR
+cp tez-site.xml $PREFIX/$CONF_DIST_DIR
+ln -s $CONF_DIR $PREFIX/$LIB_DIR/conf
 
 TEZ_TAR=$BUILD_DIR/tez-dist/target/tez-[[:digit:]]*[[:digit:]].tar.gz
 cp $TEZ_TAR $PREFIX/$LIB_DIR/lib/tez.tar.gz
diff --git a/bigtop-packages/src/rpm/tez/SPECS/tez.spec 
b/bigtop-packages/src/rpm/tez/SPECS/tez.spec
index e53c9e65..74dcce1d 100644
--- a/bigtop-packages/src/rpm/tez/SPECS/tez.spec
+++ b/bigtop-packages/src/rpm/tez/SPECS/tez.spec
@@ -38,13 +38,18 @@
 %define suse_check \# Define an empty suse_check for compatibility with older 
sles
 %endif
 
-%define doc_tez %{_docdir}/tez
+%define doc_tez %{_docdir}/%{name}
 %define alternatives_cmd update-alternatives
 %define __os_install_post \
     %{suse_check} ; \
     /usr/lib/rpm/brp-compress ; \
     %{nil}
 
+%else
+
+%define doc_tez %{_docdir}/%{name}-%{tez_version}
+%define alternatives_cmd alternatives
+
 %endif
 
 Name: tez
@@ -105,16 +110,21 @@ sh %{SOURCE2} \
 
 %pre
 
+# Manage configuration symlink
 %post
+%{alternatives_cmd} --install /etc/tez/conf %{name}-conf /etc/tez/conf.dist 30
 
 %preun
+if [ "$1" = 0 ]; then
+        %{alternatives_cmd} --remove %{name}-conf /etc/tez/conf.dist || :
+fi
 
 #######################
 #### FILES SECTION ####
 #######################
 %files
 %defattr(-,root,root)
+%config(noreplace) /etc/tez/conf.dist
 %{tez_home}
 %doc %{doc_tez}
 %{man_dir}/man1/tez.1.*
-%config(noreplace) /etc/tez/conf/tez-site.xml