From ca944a63e3201d07eaffc045c24d9c5381e5d040 Mon Sep 17 00:00:00 2001
From: Vitaliy Filippov <vitalif@yourcmc.ru>
Date: Thu, 28 Dec 2017 20:02:13 +0300
Subject: [PATCH] Fix log paths

---
 Dockerfile              | 3 ++-
 etc/nginx/global_params | 3 +++
 etc/nginx/nginx.conf    | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 etc/nginx/global_params

diff --git a/Dockerfile b/Dockerfile
index a37d4fc..885a65b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,6 +32,7 @@ RUN mkdir /home/data && \
     mv /var/lib/sphinxsearch /home/data/sphinxsearch && \
     ln -s /home/data/mysql /var/lib/mysql && \
     ln -s /home/data/sphinxsearch /var/lib/sphinxsearch && \
+    rm /etc/nginx/sites-enabled/default && \
     mkdir /home/data/logs && \
     mv /var/log/nginx /home/data/logs && \
     ln -s /home/data/logs/nginx /var/log/nginx && \
@@ -56,7 +57,7 @@ RUN service sphinxsearch start && \
 
 # Update image incrementally
 
-# ADD bugzilla4intranet-version /etc/mediawiki4intranet-version
+# ADD bugzilla4intranet-version /etc/bugzilla4intranet-version
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confdef" \
     -o Dpkg::Options::="--force-confold" dist-upgrade -y \
diff --git a/etc/nginx/global_params b/etc/nginx/global_params
new file mode 100644
index 0000000..643eb2d
--- /dev/null
+++ b/etc/nginx/global_params
@@ -0,0 +1,3 @@
+location ~ /(\.(git|svn|bzr|hg)|CVS)/ {
+    deny all;
+}
diff --git a/etc/nginx/nginx.conf b/etc/nginx/nginx.conf
index 2f63b27..ebb0e25 100644
--- a/etc/nginx/nginx.conf
+++ b/etc/nginx/nginx.conf
@@ -26,8 +26,8 @@ http {
 	ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # Dropping SSLv3, ref: POODLE
 	ssl_prefer_server_ciphers on;
 
-	access_log /home/wiki4intranet/data/logs/nginx/access.log;
-	error_log /home/wiki4intranet/data/logs/nginx/error.log;
+	access_log /home/data/logs/nginx/access.log;
+	error_log /home/data/logs/nginx/error.log;
 
 	gzip on;
 	gzip_disable "msie6";