From 94f0f72bc5f03741575e44c21c94224b993e8fca Mon Sep 17 00:00:00 2001 From: Ashley Rich Date: Mon, 23 Nov 2015 10:59:37 +0000 Subject: [PATCH] Restructure server includes --- global/server/defaults.conf | 8 ++++++++ global/{ => server}/security.conf | 0 nginx.conf | 3 --- sites-available/fastcgi-cache.com | 7 ++----- sites-available/multisite-subdirectory.com | 7 ++----- sites-available/multisite-subdomain.com | 7 ++----- sites-available/singlesite.com | 7 ++----- sites-available/ssl.com | 7 ++----- 8 files changed, 18 insertions(+), 28 deletions(-) create mode 100644 global/server/defaults.conf rename global/{ => server}/security.conf (100%) diff --git a/global/server/defaults.conf b/global/server/defaults.conf new file mode 100644 index 0000000..2cc5d19 --- /dev/null +++ b/global/server/defaults.conf @@ -0,0 +1,8 @@ +# Exclusions +include global/server/exclusions.conf; + +# Security +include global/server/security.conf; + +# Static Content +include global/server/static-files.conf; \ No newline at end of file diff --git a/global/security.conf b/global/server/security.conf similarity index 100% rename from global/security.conf rename to global/server/security.conf diff --git a/nginx.conf b/nginx.conf index e6deca9..b10a170 100644 --- a/nginx.conf +++ b/nginx.conf @@ -38,9 +38,6 @@ http { # Gzip include global/gzip.conf; - # Security - include global/security.conf; - # Modules include /etc/nginx/conf.d/*.conf; diff --git a/sites-available/fastcgi-cache.com b/sites-available/fastcgi-cache.com index f1a15da..7c710b1 100644 --- a/sites-available/fastcgi-cache.com +++ b/sites-available/fastcgi-cache.com @@ -20,11 +20,8 @@ server { access_log /sites/fastcgi-cache.com/logs/access.log; error_log /sites/fastcgi-cache.com/logs/error.log; - # Exclusions - include global/server/exclusions.conf; - - # Static content - include global/server/static-files.conf; + # Default server block rules + include global/server/defaults.conf; # Fastcgi cache rules include global/server/fastcgi-cache.conf; diff --git a/sites-available/multisite-subdirectory.com b/sites-available/multisite-subdirectory.com index 6d57ecd..faeee48 100644 --- a/sites-available/multisite-subdirectory.com +++ b/sites-available/multisite-subdirectory.com @@ -15,11 +15,8 @@ server { access_log /sites/multisite-subdirectory.com/logs/access.log; error_log /sites/multisite-subdirectory.com/logs/error.log; - # Exclusions - include global/server/exclusions.conf; - - # Static content - include global/server/static-files.conf; + # Default server block rules + include global/server/defaults.conf; # Multisite subdirectory install include global/server/multisite-subdirectory.conf; diff --git a/sites-available/multisite-subdomain.com b/sites-available/multisite-subdomain.com index aa08cf0..d121459 100644 --- a/sites-available/multisite-subdomain.com +++ b/sites-available/multisite-subdomain.com @@ -15,11 +15,8 @@ server { access_log /sites/multisite-subdomain.com/logs/access.log; error_log /sites/multisite-subdomain.com/logs/error.log; - # Exclusions - include global/server/exclusions.conf; - - # Static content - include global/server/static-files.conf; + # Default server block rules + include global/server/defaults.conf; location / { try_files $uri $uri/ /index.php?$args; diff --git a/sites-available/singlesite.com b/sites-available/singlesite.com index c8117a6..7dfb538 100644 --- a/sites-available/singlesite.com +++ b/sites-available/singlesite.com @@ -15,11 +15,8 @@ server { access_log /sites/singlesite.com/logs/access.log; error_log /sites/singlesite.com/logs/error.log; - # Exclusions - include global/server/exclusions.conf; - - # Static content - include global/server/static-files.conf; + # Default server block rules + include global/server/defaults.conf; location / { try_files $uri $uri/ /index.php?$args; diff --git a/sites-available/ssl.com b/sites-available/ssl.com index a9a0561..21a8a15 100644 --- a/sites-available/ssl.com +++ b/sites-available/ssl.com @@ -20,11 +20,8 @@ server { access_log /sites/ssl.com/logs/access.log; error_log /sites/ssl.com/logs/error.log; - # Exclusions - include global/server/exclusions.conf; - - # Static content - include global/server/static-files.conf; + # Default server block rules + include global/server/defaults.conf; # SSL rules include global/server/ssl.conf;