From a08d7d8914701400dfe9ac15348d5604601dc29a Mon Sep 17 00:00:00 2001
From: Dmitriy Shesterkin <mitri4@bk.ru>
Date: Thu, 29 Jun 2017 15:06:52 +0300
Subject: [PATCH] flower

---
 conf/nginx.conf      | 16 ----------------
 conf/supervisor.conf |  2 +-
 docker-compose.yml   |  1 +
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 15479ab..d8cca73 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -21,10 +21,6 @@ http {
         server unix:/tmp/gunicorn.sock fail_timeout=0;
     }
 
-    upstream flower {
-        server unix:/tmp/flower.sock fail_timeout=0;
-    }
-
     server {
         listen 80;
         server_name _;
@@ -43,18 +39,6 @@ http {
             expires 30d;
         }
 
-        location /flower {
-            proxy_pass   http://flower;
-            proxy_http_version 1.1;
-            proxy_redirect off;
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection "upgrade";
-            proxy_set_header Host $http_host;
-            proxy_connect_timeout 86400;
-            proxy_read_timeout 86400;
-            proxy_send_timeout 86400;
-        }
-
         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 f6d36ef..d4f37d5 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 --unix_socket=/tmp/flower.sock --broker=amqp://dokumentor:dokumentor@rabbitmq:5672//
+command=celery -A src.dokumentor flower -l info -E -B --broker=amqp://dokumentor:dokumentor@rabbitmq:5672// --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 f447685..74f1e0c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,6 +9,7 @@ services:
             - ./:/opt/app
         ports:
             - "32768:80"
+            - "33798:5555"
         env_file: conf/env
         depends_on:
             - db