Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 00FCD200C7C for ; Mon, 5 Jun 2017 23:49:18 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id F3C26160BD4; Mon, 5 Jun 2017 21:49:17 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 465DD160BBB for ; Mon, 5 Jun 2017 23:49:17 +0200 (CEST) Received: (qmail 14387 invoked by uid 500); 5 Jun 2017 21:49:16 -0000 Mailing-List: contact commits-help@metron.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@metron.apache.org Delivered-To: mailing list commits@metron.apache.org Received: (qmail 14377 invoked by uid 99); 5 Jun 2017 21:49:16 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Jun 2017 21:49:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4A87BDFF2D; Mon, 5 Jun 2017 21:49:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rmerriman@apache.org To: commits@metron.apache.org Message-Id: <1bb7fe7d527846e1bff9ccfbe8fa9aa3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: metron git commit: METRON-978 Management UI init script uses hard-coded METRON_HOME (merrimanr) closes apache/metron#604 Date: Mon, 5 Jun 2017 21:49:16 +0000 (UTC) archived-at: Mon, 05 Jun 2017 21:49:18 -0000 Repository: metron Updated Branches: refs/heads/master d5abcf429 -> 43e529fe0 METRON-978 Management UI init script uses hard-coded METRON_HOME (merrimanr) closes apache/metron#604 Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/43e529fe Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/43e529fe Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/43e529fe Branch: refs/heads/master Commit: 43e529fe003b84c585555be9f25a4ff49d769132 Parents: d5abcf4 Author: merrimanr Authored: Mon Jun 5 16:48:49 2017 -0500 Committer: merrimanr Committed: Mon Jun 5 16:48:49 2017 -0500 ---------------------------------------------------------------------- metron-interface/metron-config/scripts/metron-management-ui | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metron/blob/43e529fe/metron-interface/metron-config/scripts/metron-management-ui ---------------------------------------------------------------------- diff --git a/metron-interface/metron-config/scripts/metron-management-ui b/metron-interface/metron-config/scripts/metron-management-ui index 32b4e9e..34c0cb6 100644 --- a/metron-interface/metron-config/scripts/metron-management-ui +++ b/metron-interface/metron-config/scripts/metron-management-ui @@ -33,6 +33,11 @@ METRON_LOG_DIR="/var/log/metron" METRON_PID_DIR="/var/run/metron" METRON_USER="metron" METRON_GROUP="metron" +METRON_SYSCONFIG="/etc/sysconfig/metron" +if [ -f "$METRON_SYSCONFIG" ]; then + set -a + . "$METRON_SYSCONFIG" +fi PIDFILE="$METRON_PID_DIR/$NAME.pid" LOCKFILE=/var/lock/subsys/$NAME