From d3a9482024c08e5f2b6fe4bf76eda162d421cbaf Mon Sep 17 00:00:00 2001
From: Dmitriy Shesterkin <mitri4@bk.ru>
Date: Fri, 5 May 2017 01:41:20 +0300
Subject: [PATCH] settings for stage

---
 conf/nginx.stage.conf.template        | 70 +++++++++++++++++++++++++++
 docker-compose.stage.yml              | 13 +++--
 src/dokumentor/settings/production.py |  8 +--
 src/dokumentor/settings/stage.py      | 11 ++---
 4 files changed, 84 insertions(+), 18 deletions(-)

diff --git a/conf/nginx.stage.conf.template b/conf/nginx.stage.conf.template
index e69de29..27fe5d8 100644
--- a/conf/nginx.stage.conf.template
+++ b/conf/nginx.stage.conf.template
@@ -0,0 +1,70 @@
+server {
+
+   listen         80;
+   server_name    {{ project }} www.{{ project }};
+
+   if ($http_x_forwarded_proto = "http") {
+     return 301 https://$server_name$request_uri;
+   }
+
+    # Set the charset
+    charset utf-8;
+
+    # Set the max size for file uploads to 10Mb
+    client_max_body_size 10M;
+
+    access_log  /var/log/nginx/{{ project }}-access.log;
+    error_log   /var/log/nginx/{{ project }}-error.log;
+
+    gzip on;
+    gzip_disable "msie6";
+    gzip_types
+        text/plain
+        application/atom+xml
+        application/rss+xml
+        application/vnd.ms-fontobject
+        application/x-font-ttf
+        application/x-web-app-manifest+json
+        font/opentype
+        image/x-icon
+        application/xhtml+xml
+        text/css
+        application/json
+        image/svg+xml
+        application/x-javascript
+        text/xml
+        application/xml
+        application/xml+rss
+        text/javascript
+        application/javascript
+        text/x-component;
+
+    location /static/ {
+        root /home/{{ user }}/projects/{{ project }}/public;
+        expires 30d;
+        autoindex on;
+    }
+
+    location /media/ {
+        root /home/{{ user }}/projects/{{ project }}/public;
+        expires 30d;
+        autoindex on;
+    }
+
+    location /robots.txt {
+        alias /home/{{ user }}/projects/{{ project }}/src/templates/robots.txt;
+    }
+
+    location / {
+        proxy_pass http://127.0.0.1: {{ port }};
+        proxy_set_header Host $server_name;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        client_max_body_size                            32M;
+        client_body_buffer_size                         512k;
+        proxy_connect_timeout                           300;
+        proxy_send_timeout                              90;
+        proxy_read_timeout                              4000;
+        proxy_buffers                                   32 4k;
+    }
+  }
diff --git a/docker-compose.stage.yml b/docker-compose.stage.yml
index ee96dc6..17204dc 100644
--- a/docker-compose.stage.yml
+++ b/docker-compose.stage.yml
@@ -16,10 +16,9 @@ services:
     environment:
         RABBITMQ_DEFAULT_USER: 'dokumentor'
         RABBITMQ_DEFAULT_PASS: 'dokumentor'
-    ports:
-      - "8080:15672"
-      - "5672:5672"
-      - "5671:5671"
+    expose:
+      - "5672"
+      - "5671"
 
   celery:
     restart: always
@@ -43,8 +42,8 @@ services:
   redis:
     restart: always
     image: redis:latest
-    ports:
-      - '6379:6379'
+    expose:
+      - '6379'
 
   web:
     restart: always
@@ -56,7 +55,7 @@ services:
       - .:/code
     entrypoint: bin/docker-local-entrypoint.sh
     ports:
-      - "8000:8000"
+      - "18001:8000"
     env_file: conf/env
     environment:
       DJANGO_DB: 'postgres://dokumentor:dokumentor@db:5432/dokumentor'
diff --git a/src/dokumentor/settings/production.py b/src/dokumentor/settings/production.py
index 78d2f6e..5933629 100644
--- a/src/dokumentor/settings/production.py
+++ b/src/dokumentor/settings/production.py
@@ -17,10 +17,10 @@ DATABASES = {
 }
 
 
-# Wrap loaders in cached loader
-TEMPLATES[0]['OPTIONS']['loaders'] = [
-    ('django.template.loaders.cached.Loader', TEMPLATES[0]['OPTIONS']['loaders']),
-]
+# Wrap loaders in cached loader # TODO: check, not start in stage
+# TEMPLATES[0]['OPTIONS']['loaders'] = [
+#     ('django.template.loaders.cached.Loader', TEMPLATES[0]['OPTIONS']['loaders']),
+# ]
 
 DEFAULT_FROM_EMAIL = e.get('DJANGO_FROM_EMAIL')
 SERVER_EMAIL = DEFAULT_FROM_EMAIL
diff --git a/src/dokumentor/settings/stage.py b/src/dokumentor/settings/stage.py
index 5933629..ac3685d 100644
--- a/src/dokumentor/settings/stage.py
+++ b/src/dokumentor/settings/stage.py
@@ -6,22 +6,19 @@ from dokumentor.settings.base import *
 
 DEBUG = False
 
-ADMINS = []
+ADMINS = [
+    ('Dmitriy Shesterkin', 'mitri4@bk.ru'),
+]
 
 MANAGERS = ADMINS
 
-ALLOWED_HOSTS = ['dokumentor.ru']
+ALLOWED_HOSTS = ['dokumentor.mitri4.pro']
 
 DATABASES = {
     'default': dj_database_url.parse(e.get('DJANGO_DB')),
 }
 
 
-# Wrap loaders in cached loader # TODO: check, not start in stage
-# TEMPLATES[0]['OPTIONS']['loaders'] = [
-#     ('django.template.loaders.cached.Loader', TEMPLATES[0]['OPTIONS']['loaders']),
-# ]
-
 DEFAULT_FROM_EMAIL = e.get('DJANGO_FROM_EMAIL')
 SERVER_EMAIL = DEFAULT_FROM_EMAIL
 EMAIL_HOST = e.get('DJANGO_EMAIL_HOST')