x/compass-core
Code Issues Proposed changes

Revert "add LOCAL_REPO flag to indicate whether using offline repo install logstash-forwarders from compass_install repo if installing offline"

Browse Source 
This reverts commit 8aec09c8de10ecd4814b9c09890c12d9981544a7.

Change-Id: Ie006b51b6f970e38458f3ca76c50f52c42373f79
This commit is contained in:
Xicheng Chang 2017-01-19 22:39:03 +00:00
parent 8aec09c8de
commit 3273a45b1d
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
install/install.conf
View File

@ -3,8 +3,6 @@
##################################### #####################################
# Agent or Fullserver # Agent or Fullserver
export FULL_COMPASS_SERVER="false" export FULL_COMPASS_SERVER="false"
#using offline repo or not
export LOCAL_REPO="false"
#url of compass offline repo #url of compass offline repo
#export REPO="http://10.145.250.80:9999" #export REPO="http://10.145.250.80:9999"
# User Email # User Email
@ -72,6 +70,8 @@ export NAMESERVER_REVERSE_ZONES="unused"
export CBLR_USER= export CBLR_USER=
export CBLR_PASSWD= export CBLR_PASSWD=
# set default local repo flag
export LOCAL_REPO=
export SUPPORT_CENTOS_7_2= export SUPPORT_CENTOS_7_2=
export SUPPORT_UBUNTU_14_04_03= export SUPPORT_UBUNTU_14_04_03=

4
install/logstash-forwarder.sh
View File

@ -5,9 +5,7 @@ echo "Installing logstash-forwarder"
DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
source $DIR/install.conf 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
sudo cp -rf $COMPASSDIR/misc/logstash-forwarder/logstash-forwarder.repo /etc/yum.repos.d/logstash-forwarder.repo
fi
sudo yum -y install logstash-forwarder sudo yum -y install logstash-forwarder
sudo rm -rf /etc/logstash-forwarder.conf sudo rm -rf /etc/logstash-forwarder.conf
sudo cp -rf $COMPASSDIR/misc/logstash-forwarder/logstash-forwarder.conf /etc/logstash-forwarder.conf sudo cp -rf $COMPASSDIR/misc/logstash-forwarder/logstash-forwarder.conf /etc/logstash-forwarder.conf