From e9ba0d60008164701d0081b0b96c8d55cd9a5e1f Mon Sep 17 00:00:00 2001 From: Dmitriy Shesterkin Date: Thu, 29 Jun 2017 15:14:40 +0300 Subject: [PATCH] flower socket --- conf/nginx.conf | 16 ++++++++++++++++ conf/supervisor.conf | 2 +- docker-compose.yml | 1 - 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index d8cca73..d5c21b6 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -21,6 +21,10 @@ http { server unix:/tmp/gunicorn.sock fail_timeout=0; } + upstream flower { + server unix:/tmp/flower.sock fail_timeout=0; + } + server { listen 80; server_name _; @@ -39,6 +43,18 @@ http { expires 30d; } + location /flower/ { + proxy_pass http://flower; + proxy_redirect off; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Protocol $scheme; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_http_version 1.1; + } + location / { proxy_set_header Host $http_host; proxy_set_header X-Real-IP $remote_addr; diff --git a/conf/supervisor.conf b/conf/supervisor.conf index d4f37d5..b7820aa 100644 --- a/conf/supervisor.conf +++ b/conf/supervisor.conf @@ -37,7 +37,7 @@ startsecs=10 stopwaitsecs=600 [program:flower] -command=celery -A src.dokumentor flower -l info -E -B --broker=amqp://dokumentor:dokumentor@rabbitmq:5672// --basic_auth=dokumentor:dokumentor +command=celery -A src.dokumentor flower -l info -E -B --unix_socket=/tmp/flower.sock --broker=amqp://dokumentor:dokumentor@rabbitmq:5672// --url_prefix=flower --basic_auth=dokumentor:dokumentor directory=/opt/app stdout_logfile=/var/log/celery-flower.log stderr_logfile=/var/log/celery-flower-error.log diff --git a/docker-compose.yml b/docker-compose.yml index 74f1e0c..f447685 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,7 +9,6 @@ services: - ./:/opt/app ports: - "32768:80" - - "33798:5555" env_file: conf/env depends_on: - db