From 0a6ba5738fe527750800bf38ebb32ad87385f928 Mon Sep 17 00:00:00 2001
From: Dmitriy Shesterkin <mitri4@bk.ru>
Date: Thu, 6 Jul 2017 14:57:51 +0300
Subject: [PATCH] refactor debian image, some permisson settings

---
 Dockerfile                   | 7 ++-----
 conf/nginx.conf              | 8 +++++++-
 src/docs/views/base_views.py | 2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 55b7e0b..672f8df 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,8 +10,8 @@ ENV NGINX_VERSION="1.13.2" \
                 --pid-path=/var/run/nginx.pid \
                 --http-log-path=/var/log/nginx/access.log \
                 --error-log-path=/var/log/nginx/error.log \
-                --user=nginx \
-                --group=nginx \
+                --user=www-data \
+                --group=www-data \
                 --add-module=/tmp/modules/nginx_requestid-master"
 
 COPY requirements /opt/app/requirements
@@ -25,9 +25,6 @@ RUN apt-get update -y && \
     make && \
     apt-get clean && \
 
-    # Add nginx group and user
-    addgroup -S nginx && \
-    adduser -S nginx -G nginx && \
     # Download additional nginx modules
     mkdir -p /tmp/modules && \
     cd /tmp/modules && \
diff --git a/conf/nginx.conf b/conf/nginx.conf
index dab0d29..c421108 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,6 +1,6 @@
 worker_processes 1;
 
-user nginx;
+user www-data;
 pid /var/run/nginx.pid;
 error_log /var/log/nginx/error.log;
 
@@ -39,6 +39,12 @@ http {
             expires 30d;
         }
 
+        location /favicon.ico {
+            alias /opt/app/public/static/favicon.ico;
+            expires 30d;
+        }
+
+
         location / {
             proxy_set_header Host $http_host;
             proxy_set_header X-Real-IP $remote_addr;
diff --git a/src/docs/views/base_views.py b/src/docs/views/base_views.py
index aa47ca4..3637e1e 100644
--- a/src/docs/views/base_views.py
+++ b/src/docs/views/base_views.py
@@ -417,7 +417,7 @@ class BaseViews(object):
             tmp_dir = tempfile.mkdtemp(dir=tmp_media_dir)
 
             if not settings.DEBUG:
-                os.chmod(tmp_dir, 755)
+                # os.chmod(tmp_dir, 755)
                 GHOSTSCRIPTCMD = '/usr/bin/gs'
 
             tmp_dirname = os.path.split(tmp_dir)[1]