Skip to content

Commit

Permalink
Merge pull request yacy#19 from nikhilrayaprolu/travisfinal
Browse files Browse the repository at this point in the history
Fixes yacy#18 Now Yacy is able to connect with elastic search
  • Loading branch information
mariobehling authored Jul 18, 2017
2 parents 196ad8f + fb6ed07 commit a999348
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
1 change: 0 additions & 1 deletion deploy_staging.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ docker build -t nikhilrayaprolu/yacygridmcp:$TRAVIS_COMMIT ./docker
docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
docker push nikhilrayaprolu/yacygridmcp
echo $GCLOUD_SERVICE | base64 --decode -i > ${HOME}/gcloud-service-key.json
cat ${HOME}/gcloud-service-key.json
gcloud auth activate-service-account --key-file ${HOME}/gcloud-service-key.json

gcloud --quiet config set project $PROJECT_NAME_STG
Expand Down
8 changes: 6 additions & 2 deletions docker/start.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
cd /apache-ftpserver-1.1.0
adduser --disabled-password --gecos '' r
adduser r sudo
echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
chmod a+rwx /elasticsearch-5.5.0 -R
su -m r -c '/elasticsearch-5.5.0/bin/elasticsearch -Ecluster.name=yacygrid &'
cd /apache-ftpserver-1.1.0
./bin/ftpd.sh res/conf/ftpd-typical.xml &
/rabbitmq_server-3.6.6/sbin/rabbitmq-server -detached
sleep 5s;
/rabbitmq_server-3.6.6/sbin/rabbitmq-plugins enable rabbitmq_management
/rabbitmq_server-3.6.6/sbin/rabbitmqctl add_user yacygrid password4account
echo [{rabbit, [{loopback_users, []}]}]. >> /rabbitmq_server-3.6.6/etc/rabbitmq/rabbitmq.config
/rabbitmq_server-3.6.6/sbin/rabbitmqctl set_permissions -p / yacygrid ".*" ".*" ".*"
elasticsearch-5.5.0/bin/elasticsearch -d -p pid -Ecluster.name=yacygrid
cd /yacy_grid_mcp
sleep 5s;
gradle run

0 comments on commit a999348

Please sign in to comment.