From 2b1c021d878d6bd6ff55073d03dd224de0d87dd1 Mon Sep 17 00:00:00 2001
From: Ashley Rich <hello@ashleyrich.com>
Date: Tue, 17 Nov 2015 19:49:40 +0000
Subject: [PATCH] Improved logs structure

---
 nginx.conf                                 | 5 +++--
 {global => per-site}/logs.conf             | 6 ------
 sites-available/fastcgi-cache.com          | 3 +++
 sites-available/multisite-subdirectory.com | 3 +++
 sites-available/multisite-subdomain.com    | 3 +++
 sites-available/singlesite.com             | 3 +++
 sites-available/ssl.com                    | 3 +++
 7 files changed, 18 insertions(+), 8 deletions(-)
 rename {global => per-site}/logs.conf (60%)

diff --git a/nginx.conf b/nginx.conf
index 2e1c99c..714cf11 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -32,8 +32,9 @@ http {
 	# Limits & Timeouts
 	include global/limits.conf;
 
-	# Logs
-	include global/logs.conf;
+	# Default Logs
+    error_log /var/log/nginx/error.log warn;
+    access_log /var/log/nginx/access.log;
 
 	# Gzip
 	include global/gzip.conf;
diff --git a/global/logs.conf b/per-site/logs.conf
similarity index 60%
rename from global/logs.conf
rename to per-site/logs.conf
index ed80dd8..f6e51e0 100644
--- a/global/logs.conf
+++ b/per-site/logs.conf
@@ -1,9 +1,3 @@
-# Default error log file. Only used when you don't override error_log in the server block.
-error_log /var/log/nginx/error.log warn;
-
-# Default access log file. Only used when you don't override access_log in the server block.
-access_log /var/log/nginx/access.log;
-
 # Don't record error/access logs for favicon.io.
 location = /favicon.ico {
 	log_not_found off;
diff --git a/sites-available/fastcgi-cache.com b/sites-available/fastcgi-cache.com
index e550075..35483fd 100644
--- a/sites-available/fastcgi-cache.com
+++ b/sites-available/fastcgi-cache.com
@@ -20,6 +20,9 @@ server {
 	access_log /sites/fastcgi-cache.com/logs/access.log;
 	error_log /sites/fastcgi-cache.com/logs/error.log;
 
+	# Log exclusions
+	include per-site/logs.conf;
+
     # Fastcgi cache rules
     include per-site/fastcgi-cache.conf;
 
diff --git a/sites-available/multisite-subdirectory.com b/sites-available/multisite-subdirectory.com
index 8103df0..38e3603 100644
--- a/sites-available/multisite-subdirectory.com
+++ b/sites-available/multisite-subdirectory.com
@@ -15,6 +15,9 @@ server {
 	access_log /sites/multisite-subdirectory.com/logs/access.log;
 	error_log /sites/multisite-subdirectory.com/logs/error.log;
 
+	# Log exclusions
+	include per-site/logs.conf;
+
 	location / {
 		try_files $uri $uri/ /index.php?$args;
 	}
diff --git a/sites-available/multisite-subdomain.com b/sites-available/multisite-subdomain.com
index a77d05a..8d4df72 100644
--- a/sites-available/multisite-subdomain.com
+++ b/sites-available/multisite-subdomain.com
@@ -15,6 +15,9 @@ server {
 	access_log /sites/multisite-subdomain.com/logs/access.log;
 	error_log /sites/multisite-subdomain.com/logs/error.log;
 
+	# Log exclusions
+	include per-site/logs.conf;
+
 	location / {
 		try_files $uri $uri/ /index.php?$args;
 	}
diff --git a/sites-available/singlesite.com b/sites-available/singlesite.com
index f788363..05640d6 100644
--- a/sites-available/singlesite.com
+++ b/sites-available/singlesite.com
@@ -15,6 +15,9 @@ server {
 	access_log /sites/singlesite.com/logs/access.log;
 	error_log /sites/singlesite.com/logs/error.log;
 
+	# Log exclusions
+	include per-site/logs.conf;
+
 	location / {
 		try_files $uri $uri/ /index.php?$args;
 	}
diff --git a/sites-available/ssl.com b/sites-available/ssl.com
index 7f23a97..c295364 100644
--- a/sites-available/ssl.com
+++ b/sites-available/ssl.com
@@ -20,6 +20,9 @@ server {
 	access_log /sites/ssl.com/logs/access.log;
 	error_log /sites/ssl.com/logs/error.log;
 
+	# Log exclusions
+    include per-site/logs.conf;
+
     # SSL rules
     include per-site/ssl.conf;