[bigtop] branch master updated: BIGTOP-3595: Fix missing webui module for building Alluxio RMP package and failure to create alluxio user after installing Alluxio (#826)

[iw...@apache.org]

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

iwasakims 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 e3e1e0e  BIGTOP-3595: Fix missing webui module for building Alluxio RMP package and failure to create alluxio user after installing Alluxio (#826)
e3e1e0e is described below

commit e3e1e0e70cda56153c0bbed87d8c40d4c36f06d7
Author: chendeyong <94...@qq.com>
AuthorDate: Sat Nov 6 20:16:51 2021 +0800

    BIGTOP-3595: Fix missing webui module for building Alluxio RMP package and failure to create alluxio user after installing Alluxio (#826)
---
 bigtop-packages/src/common/alluxio/install_alluxio.sh | 4 ++++
 bigtop-packages/src/rpm/alluxio/SPECS/alluxio.spec    | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/bigtop-packages/src/common/alluxio/install_alluxio.sh b/bigtop-packages/src/common/alluxio/install_alluxio.sh
index 015febc..a4f9a99 100644
--- a/bigtop-packages/src/common/alluxio/install_alluxio.sh
+++ b/bigtop-packages/src/common/alluxio/install_alluxio.sh
@@ -101,6 +101,8 @@ install -d -m 0755 $PREFIX/$LIB_DIR/bin
 install -d -m 0755 $PREFIX/$LIB_DIR/libexec
 install -d -m 0755 $PREFIX/$LIB_DIR/lib
 install -d -m 0755 $PREFIX/$LIB_DIR/client
+install -d -m 0755 $PREFIX/$LIB_DIR/webui/master
+install -d -m 0755 $PREFIX/$LIB_DIR/webui/worker
 install -d -m 0755 $PREFIX/$LIB_DIR/integration
 install -d -m 0755 $PREFIX/$LIB_DIR/share
 install -d -m 0755 $PREFIX/$LIB_DIR/core/server/common/src/main/webapp
@@ -121,6 +123,8 @@ cp assembly/server/target/alluxio*dependencies.jar $PREFIX/$LIB_DIR/assembly/ser
 cp assembly/client/target/alluxio*dependencies.jar $PREFIX/$LIB_DIR/assembly/client/target
 cp -a bin/* $PREFIX/$LIB_DIR/bin
 cp -a lib/* $PREFIX/$LIB_DIR/lib
+cp -a webui/master/build $PREFIX/$LIB_DIR/webui/master
+cp -a webui/worker/build $PREFIX/$LIB_DIR/webui/worker
 cp -a libexec/* $PREFIX/$LIB_DIR/libexec
 cp -a client/* $PREFIX/$LIB_DIR/client
 cp -a integration/* $PREFIX/$LIB_DIR/integration
diff --git a/bigtop-packages/src/rpm/alluxio/SPECS/alluxio.spec b/bigtop-packages/src/rpm/alluxio/SPECS/alluxio.spec
index dd6fa18..abeb709 100644
--- a/bigtop-packages/src/rpm/alluxio/SPECS/alluxio.spec
+++ b/bigtop-packages/src/rpm/alluxio/SPECS/alluxio.spec
@@ -109,7 +109,7 @@ done
 
 %pre
 getent group alluxio >/dev/null || groupadd -r alluxio
-getent passwd alluxio >/dev/null || useradd -c "Alluxio" -s /sbin/nologin -g alluxio -r -d %{var_lib_alluxio} alluxio 2> /dev/null || :
+getent passwd alluxio >/dev/null || useradd -c "Alluxio" -s /sbin/nologin -g alluxio -r -d %{var_lib} alluxio 2> /dev/null || :
 
 %post
 %{alternatives_cmd} --install %{config_alluxio} %{alluxio_name}-conf %{config_alluxio}.dist 30