This is an automated email from the ASF dual-hosted git repository.
oleewere pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new fa403a6 AMBARI-22772. Log Search / Log Feeder - config symlink cannot
be created if etc/ambari-logsearch* folders do not exist
fa403a6 is described below
commit fa403a6edb62eaf4f927f733457d96bac15336eb
Author: Oliver Szabo <[email protected]>
AuthorDate: Fri Jan 12 12:32:37 2018 +0100
AMBARI-22772. Log Search / Log Feeder - config symlink cannot be created if
etc/ambari-logsearch* folders do not exist
---
.../src/main/package/rpm/logfeeder/postinstall.sh | 5 ++++-
.../src/main/package/rpm/logfeeder/postremove.sh | 6 ++++--
.../src/main/package/rpm/portal/postinstall.sh | 5 ++++-
.../src/main/package/rpm/portal/postremove.sh | 6 ++++--
4 files changed, 16 insertions(+), 6 deletions(-)
diff --git
a/ambari-logsearch/ambari-logsearch-assembly/src/main/package/rpm/logfeeder/postinstall.sh
b/ambari-logsearch/ambari-logsearch-assembly/src/main/package/rpm/logfeeder/postinstall.sh
index a4eec77..057227d 100755
---
a/ambari-logsearch/ambari-logsearch-assembly/src/main/package/rpm/logfeeder/postinstall.sh
+++
b/ambari-logsearch/ambari-logsearch-assembly/src/main/package/rpm/logfeeder/postinstall.sh
@@ -17,9 +17,12 @@
LOGFEEDER_SCRIPT_LINK_NAME="/usr/bin/logfeeder"
LOGFEEDER_SCRIPT_SOURCE="/usr/lib/ambari-logsearch-logfeeder/bin/logfeeder.sh"
-LOGFEEDER_CONF_LINK="/etc/ambari-logsearch-logfeeder/conf"
+LOGFEEDER_ETC_FOLDER="/etc/ambari-logsearch-logfeeder"
+LOGFEEDER_CONF_LINK="$LOGFEEDER_ETC_FOLDER/conf"
LOGFEEDER_CONF_SOURCE="/usr/lib/ambari-logsearch-logfeeder/conf"
+mkdir -p $LOGFEEDER_ETC_FOLDER
+
ln -s $LOGFEEDER_SCRIPT_SOURCE $LOGFEEDER_SCRIPT_LINK_NAME
ln -s $LOGFEEDER_CONF_SOURCE $LOGFEEDER_CONF_LINK
diff --git
a/ambari-logsearch/ambari-logsearch-assembly/src/main/package/rpm/logfeeder/postremove.sh
b/ambari-logsearch/ambari-logsearch-assembly/src/main/package/rpm/logfeeder/postremove.sh
index 5f1c623..4583980 100755
---
a/ambari-logsearch/ambari-logsearch-assembly/src/main/package/rpm/logfeeder/postremove.sh
+++
b/ambari-logsearch/ambari-logsearch-assembly/src/main/package/rpm/logfeeder/postremove.sh
@@ -15,7 +15,9 @@
# limitations under the License
LOGFEEDER_SCRIPT_LINK_NAME="/usr/bin/logfeeder"
-LOGFEEDER_CONF_DIR_LINK="/etc/ambari-logsearch-logfeeder/conf"
+LOGFEEDER_ETC_FOLDER="/etc/ambari-logsearch-logfeeder"
+LOGFEEDER_CONF_DIR_LINK="$LOGFEEDER_ETC_FOLDER/conf"
rm -f $LOGFEEDER_SCRIPT_LINK_NAME
-rm -f $LOGFEEDER_CONF_DIR_LINK
\ No newline at end of file
+rm -f $LOGFEEDER_CONF_DIR_LINK
+rm -f $LOGFEEDER_ETC_FOLDER
\ No newline at end of file
diff --git
a/ambari-logsearch/ambari-logsearch-assembly/src/main/package/rpm/portal/postinstall.sh
b/ambari-logsearch/ambari-logsearch-assembly/src/main/package/rpm/portal/postinstall.sh
index 9107482..0d0cb31 100644
---
a/ambari-logsearch/ambari-logsearch-assembly/src/main/package/rpm/portal/postinstall.sh
+++
b/ambari-logsearch/ambari-logsearch-assembly/src/main/package/rpm/portal/postinstall.sh
@@ -17,9 +17,12 @@
LOGSEARCH_SCRIPT_LINK_NAME="/usr/bin/logsearch"
LOGSEARCH_SCRIPT_SOURCE="/usr/lib/ambari-logsearch-portal/bin/logsearch.sh"
-LOGSEARCH_CONF_LINK="/etc/ambari-logsearch-portal/conf"
+LOGSEARCH_ETC_FOLDER="/etc/ambari-logsearch-portal"
+LOGSEARCH_CONF_LINK="$LOGSEARCH_ETC_FOLDER/conf"
LOGSEARCH_CONF_SOURCE="/usr/lib/ambari-logsearch-portal/conf"
+mkdir -p $LOGSEARCH_ETC_FOLDER
+
ln -s $LOGSEARCH_SCRIPT_SOURCE $LOGSEARCH_SCRIPT_LINK_NAME
ln -s $LOGSEARCH_CONF_SOURCE $LOGSEARCH_CONF_LINK
diff --git
a/ambari-logsearch/ambari-logsearch-assembly/src/main/package/rpm/portal/postremove.sh
b/ambari-logsearch/ambari-logsearch-assembly/src/main/package/rpm/portal/postremove.sh
index 8de05c1..b07a1ad 100644
---
a/ambari-logsearch/ambari-logsearch-assembly/src/main/package/rpm/portal/postremove.sh
+++
b/ambari-logsearch/ambari-logsearch-assembly/src/main/package/rpm/portal/postremove.sh
@@ -15,7 +15,9 @@
# limitations under the License
LOGSEARCH_SCRIPT_LINK_NAME="/usr/bin/logsearch"
-LOGSEARCH_CONF_DIR_LINK="/etc/ambari-logsearch-portal/conf"
+LOGSEARCH_ETC_FOLDER="/etc/ambari-logsearch-portal"
+LOGSEARCH_CONF_DIR_LINK="$LOGSEARCH_ETC_FOLDER/conf"
rm -f $LOGSEARCH_SCRIPT_LINK_NAME
-rm -f $LOGSEARCH_CONF_DIR_LINK
\ No newline at end of file
+rm -f $LOGSEARCH_CONF_DIR_LINK
+rm -f $LOGSEARCH_ETC_FOLDER
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
