diff --git a/per-site/exclusions.conf b/global/server/exclusions.conf similarity index 100% rename from per-site/exclusions.conf rename to global/server/exclusions.conf diff --git a/per-site/fastcgi-cache.conf b/global/server/fastcgi-cache.conf similarity index 100% rename from per-site/fastcgi-cache.conf rename to global/server/fastcgi-cache.conf diff --git a/per-site/multisite-subdirectory.conf b/global/server/multisite-subdirectory.conf similarity index 100% rename from per-site/multisite-subdirectory.conf rename to global/server/multisite-subdirectory.conf diff --git a/per-site/ssl.conf b/global/server/ssl.conf similarity index 100% rename from per-site/ssl.conf rename to global/server/ssl.conf diff --git a/per-site/static-files.conf b/global/server/static-files.conf similarity index 100% rename from per-site/static-files.conf rename to global/server/static-files.conf diff --git a/sites-available/fastcgi-cache.com b/sites-available/fastcgi-cache.com index 086308b..122c39a 100644 --- a/sites-available/fastcgi-cache.com +++ b/sites-available/fastcgi-cache.com @@ -21,13 +21,13 @@ server { error_log /sites/fastcgi-cache.com/logs/error.log; # Exclusions - include per-site/exclusions.conf; + include global/server/exclusions.conf; # Static content - include per-site/static-files.conf; + include global/server/static-files.conf; # Fastcgi cache rules - include per-site/fastcgi-cache.conf; + include global/server/fastcgi-cache.conf; location / { try_files $uri $uri/ /index.php?$args; @@ -40,7 +40,7 @@ server { # Change socket if using PHP pools fastcgi_pass unix:/var/run/php5-fpm.sock; - # Skip cache based on rules in per-site/fastcgi-cache.conf. + # Skip cache based on rules in global/server/fastcgi-cache.conf. fastcgi_cache_bypass $skip_cache; fastcgi_no_cache $skip_cache; diff --git a/sites-available/multisite-subdirectory.com b/sites-available/multisite-subdirectory.com index e16575f..8bc0f83 100644 --- a/sites-available/multisite-subdirectory.com +++ b/sites-available/multisite-subdirectory.com @@ -16,17 +16,17 @@ server { error_log /sites/multisite-subdirectory.com/logs/error.log; # Exclusions - include per-site/exclusions.conf; + include global/server/exclusions.conf; # Static content - include per-site/static-files.conf; + include global/server/static-files.conf; location / { try_files $uri $uri/ /index.php?$args; } # Multisite subdirectory install - include per-site/multisite-subdirectory.conf; + include global/server/multisite-subdirectory.conf; location ~ \.php$ { try_files $uri =404; diff --git a/sites-available/multisite-subdomain.com b/sites-available/multisite-subdomain.com index ad989b5..aa08cf0 100644 --- a/sites-available/multisite-subdomain.com +++ b/sites-available/multisite-subdomain.com @@ -16,10 +16,10 @@ server { error_log /sites/multisite-subdomain.com/logs/error.log; # Exclusions - include per-site/exclusions.conf; + include global/server/exclusions.conf; # Static content - include per-site/static-files.conf; + include global/server/static-files.conf; location / { try_files $uri $uri/ /index.php?$args; diff --git a/sites-available/singlesite.com b/sites-available/singlesite.com index 1750162..c8117a6 100644 --- a/sites-available/singlesite.com +++ b/sites-available/singlesite.com @@ -16,10 +16,10 @@ server { error_log /sites/singlesite.com/logs/error.log; # Exclusions - include per-site/exclusions.conf; + include global/server/exclusions.conf; # Static content - include per-site/static-files.conf; + include global/server/static-files.conf; location / { try_files $uri $uri/ /index.php?$args; diff --git a/sites-available/ssl.com b/sites-available/ssl.com index 23d73c8..a9a0561 100644 --- a/sites-available/ssl.com +++ b/sites-available/ssl.com @@ -21,13 +21,13 @@ server { error_log /sites/ssl.com/logs/error.log; # Exclusions - include per-site/exclusions.conf; + include global/server/exclusions.conf; # Static content - include per-site/static-files.conf; + include global/server/static-files.conf; # SSL rules - include per-site/ssl.conf; + include global/server/ssl.conf; location / { try_files $uri $uri/ /index.php?$args;