From 0b3db9035e54502d65b391bae04df0c6f01aab20 Mon Sep 17 00:00:00 2001
From: Dmitriy Shesterkin <mitri4@bk.ru>
Date: Thu, 29 Jun 2017 17:04:45 +0300
Subject: [PATCH] settings flower

---
 conf/env.template    |  5 +++++
 conf/flower_conf.py  | 13 +++++++++++++
 conf/nginx.conf      | 16 ----------------
 conf/supervisor.conf |  2 +-
 docker-compose.yml   |  1 +
 5 files changed, 20 insertions(+), 17 deletions(-)
 create mode 100644 conf/flower_conf.py

diff --git a/conf/env.template b/conf/env.template
index 3157f72..0585efa 100644
--- a/conf/env.template
+++ b/conf/env.template
@@ -2,6 +2,11 @@ DJANGO_SETTINGS_MODULE=src.dokumentor.settings.{{env}}
 
 DJANGO_SECRET='CHANGE_ME_IN_PRODUCTION'
 
+# Flower settings
+FLOWER_PORT=5555
+FLOWER_BASIC_AUTH=user:password
+
+
 DJANGO_DB='postgres://USER:PASSWORD@HOST:PORT/NAME'
 
 DJANGO_FROM_EMAIL='root@localhost'
diff --git a/conf/flower_conf.py b/conf/flower_conf.py
new file mode 100644
index 0000000..2050c46
--- /dev/null
+++ b/conf/flower_conf.py
@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+
+import os
+import envvars as e
+
+conf_dir = os.path.normpath(os.path.join(os.path.dirname(__file__), '..'))
+e.load(os.path.join(conf_dir, 'conf/env'))
+
+port = e.get('FLOWER_PORT')
+
+broker = e.get('CELERY_BROKER_URL')
+
+basic_auth = [e.get('FLOWER_BASIC_AUTH')]
diff --git a/conf/nginx.conf b/conf/nginx.conf
index d5c21b6..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_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 b7820aa..365aa21 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// --url_prefix=flower --basic_auth=dokumentor:dokumentor
+command=celery -A src.dokumentor flower -l info -E -B --conf=/opt/app/conf/flower_conf.py
 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..2614db7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,6 +9,7 @@ services:
             - ./:/opt/app
         ports:
             - "32768:80"
+            - "33768:5555"
         env_file: conf/env
         depends_on:
             - db