From 3273a45b1d3b1389cf012f6ff5d2e40a4c732308 Mon Sep 17 00:00:00 2001 From: Xicheng Chang Date: Thu, 19 Jan 2017 22:39:03 +0000 Subject: [PATCH] Revert "add LOCAL_REPO flag to indicate whether using offline repo install logstash-forwarders from compass_install repo if installing offline" This reverts commit 8aec09c8de10ecd4814b9c09890c12d9981544a7. Change-Id: Ie006b51b6f970e38458f3ca76c50f52c42373f79 --- install/install.conf | 4 ++-- install/logstash-forwarder.sh | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/install/install.conf b/install/install.conf index 5bd1b3d7..2f641433 100755 --- a/install/install.conf +++ b/install/install.conf @@ -3,8 +3,6 @@ ##################################### # Agent or Fullserver export FULL_COMPASS_SERVER="false" -#using offline repo or not -export LOCAL_REPO="false" #url of compass offline repo #export REPO="http://10.145.250.80:9999" # User Email @@ -72,6 +70,8 @@ export NAMESERVER_REVERSE_ZONES="unused" export CBLR_USER= export CBLR_PASSWD= +# set default local repo flag +export LOCAL_REPO= export SUPPORT_CENTOS_7_2= export SUPPORT_UBUNTU_14_04_03= diff --git a/install/logstash-forwarder.sh b/install/logstash-forwarder.sh index a6415aa1..a3eb33f5 100644 --- a/install/logstash-forwarder.sh +++ b/install/logstash-forwarder.sh @@ -5,9 +5,7 @@ echo "Installing logstash-forwarder" DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) source $DIR/install.conf -if [ "LOCAL_REPO" == "false"], then - sudo cp -rf $COMPASSDIR/misc/logstash-forwarder/logstash-forwarder.repo /etc/yum.repos.d/logstash-forwarder.repo -fi +sudo cp -rf $COMPASSDIR/misc/logstash-forwarder/logstash-forwarder.repo /etc/yum.repos.d/logstash-forwarder.repo sudo yum -y install logstash-forwarder sudo rm -rf /etc/logstash-forwarder.conf sudo cp -rf $COMPASSDIR/misc/logstash-forwarder/logstash-forwarder.conf /etc/logstash-forwarder.conf