Skip to content

Commit

Permalink
Using global connection pools (#198)
Browse files Browse the repository at this point in the history
Fixed bug in deregister script
Fixed bug in Kong setup script
  • Loading branch information
pct960 authored Sep 9, 2018
1 parent 4f00e7e commit 07a6a39
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 16 deletions.
Binary file modified config/webserver/cdxapis.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion install
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash
python ideam.py install -f ideam.conf
python ideam.py install -f ideam.conf $@
2 changes: 1 addition & 1 deletion modules/install.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ def docker_setup(log_file, config_path="/etc/ideam/ideam.conf"):
output_ok("Created Videoserver docker instance. \n " + details)

konga = config.get('KONGA', 'HTTP')
cmd = 'docker run -d -p 127.0.0.1:{0}:1337 --net mynet --link apigateway:kong --name konga -e "NODE_ENV=production" pantsel/konga'.\
cmd = 'docker run -d -e "DB_HOST=apigateway" -p 127.0.0.1:{0}:1337 --net mynet --link apigateway:kong --name konga -e "NODE_ENV=production" pantsel/konga'.\
format(konga)
subprocess_with_print(cmd,
success_msg="Created KONGA docker instance. ",
Expand Down
2 changes: 1 addition & 1 deletion start
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash
python ideam.py start
python ideam.py start $@
14 changes: 1 addition & 13 deletions tasks/apigateway/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,6 @@ NC='\033[0m'
YELLOW='\033[1;33m'
GREEN='\033[0;32m'

echo -e "${YELLOW}[ INFO ] ${NC}Copying RabbitMQ and LDAP password"

docker cp host_vars/rabbitmq apigateway:/etc
docker cp host_vars/ldapd apigateway:/etc

if [ $? -eq 0 ]; then
echo -e "${GREEN}[ OK ] ${NC}Copied passwords"
else
echo -e "${RED}[ ERROR ] ${NC}Failed to copy RabbitMQ and LDAP passwords"
fi

echo -e "${YELLOW}[ INFO ] ${NC}Copying setup script into kong container"

docker cp tasks/apigateway/install.sh apigateway:/etc/
Expand All @@ -36,11 +25,10 @@ else
fi

echo -e "${YELLOW}[ INFO ] ${NC}Adding necessary permissions to files and folders needed by kong"

#TODO give necessary permissions only to the required user

docker exec apigateway chmod +x /etc/install.sh
#docker exec kong chmod -R 777 /var/lib/postgresql
#docker exec kong chmod -R 777 /tmp

if [ $? -eq 0 ]; then
echo -e "${GREEN}[ OK ] ${NC}Added necessary permissions"
Expand Down

0 comments on commit 07a6a39

Please sign in to comment.