diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2017-07-06 09:44:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-07-06 09:44:05 +0000 |
| commit | 5eb90d88748ee25c0d1a858167d435a9498d175c (patch) | |
| tree | a1bc34f3badfb30fb56c05b309c8ecfccecc75d1 /reporting/docker | |
| parent | 79f400f880bc6e5d40defef9d6c8b134d91958a1 (diff) | |
| parent | 0d70a5cc6ebb22d243a4686314aecf89ca8d78e1 (diff) | |
Merge "Reporting docker deployment improvement"
Diffstat (limited to 'reporting/docker')
| -rwxr-xr-x | reporting/docker/reporting.sh | 2 | ||||
| -rw-r--r-- | reporting/docker/supervisor.conf | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/reporting/docker/reporting.sh b/reporting/docker/reporting.sh index 49f4517..7fe97a8 100755 --- a/reporting/docker/reporting.sh +++ b/reporting/docker/reporting.sh @@ -98,3 +98,5 @@ echo "daemon off;" >> /etc/nginx/nginx.conf cp /home/opnfv/utils/test/reporting/docker/supervisor.conf /etc/supervisor/conf.d/ ln -s /usr/bin/nodejs /usr/bin/node + +cd pages && /bin/bash angular.sh diff --git a/reporting/docker/supervisor.conf b/reporting/docker/supervisor.conf index 5e315ba..b323dd0 100644 --- a/reporting/docker/supervisor.conf +++ b/reporting/docker/supervisor.conf @@ -1,22 +1,19 @@ [supervisord] nodaemon = true -[program:reporting_tornado] +[program:tornado] user = root directory = /home/opnfv/utils/test/reporting/api/api command = python server.py --port=800%(process_num)d process_name=%(program_name)s%(process_num)d numprocs=4 numprocs_start=1 -autorestart = true -[program:reporting_nginx] +[program:nginx] user = root command = service nginx restart -autorestart = true -[program:reporting_angular] +[program:configuration] user = root directory = /home/opnfv/utils/test/reporting/pages -command = bash angular.sh -autorestart = true +command = bash config.sh |