From 560bdab9cf37979417204c3cf92fe38c0d9d9518 Mon Sep 17 00:00:00 2001
From: AD7six <andydawson76@gmail.com>
Date: Fri, 22 Nov 2013 10:49:07 +0000
Subject: [PATCH] Move config snippets around

Make it more obvious which snippets are location based, and which
are just directives. Need to provide more files like basic.conf to
cover more of the common use cases.
---
 h5bp/basic.conf                                       | 6 ++++++
 h5bp/{ => directive-only}/cache-file-descriptors.conf | 0
 h5bp/{ => directive-only}/cross-domain-ajax.conf      | 0
 h5bp/{ => directive-only}/no-transform.conf           | 0
 h5bp/{ => directive-only}/x-ua-compatible.conf        | 0
 h5bp/h5bp.conf                                        | 6 ------
 h5bp/{ => location}/cache-busting.conf                | 0
 h5bp/{ => location}/cross-domain-fonts.conf           | 0
 h5bp/{ => location}/expires.conf                      | 0
 h5bp/{ => location}/protect-system-files.conf         | 0
 sites-available/example.com                           | 4 ++--
 11 files changed, 8 insertions(+), 8 deletions(-)
 create mode 100644 h5bp/basic.conf
 rename h5bp/{ => directive-only}/cache-file-descriptors.conf (100%)
 rename h5bp/{ => directive-only}/cross-domain-ajax.conf (100%)
 rename h5bp/{ => directive-only}/no-transform.conf (100%)
 rename h5bp/{ => directive-only}/x-ua-compatible.conf (100%)
 delete mode 100644 h5bp/h5bp.conf
 rename h5bp/{ => location}/cache-busting.conf (100%)
 rename h5bp/{ => location}/cross-domain-fonts.conf (100%)
 rename h5bp/{ => location}/expires.conf (100%)
 rename h5bp/{ => location}/protect-system-files.conf (100%)

diff --git a/h5bp/basic.conf b/h5bp/basic.conf
new file mode 100644
index 0000000..2b85ad4
--- /dev/null
+++ b/h5bp/basic.conf
@@ -0,0 +1,6 @@
+# Basic h5bp rules
+
+include h5bp/directive-only/x-ua-compatible.conf;
+include h5bp/location/expires.conf;
+include h5bp/location/cross-domain-fonts.conf;
+include h5bp/location/protect-system-files.conf;
diff --git a/h5bp/cache-file-descriptors.conf b/h5bp/directive-only/cache-file-descriptors.conf
similarity index 100%
rename from h5bp/cache-file-descriptors.conf
rename to h5bp/directive-only/cache-file-descriptors.conf
diff --git a/h5bp/cross-domain-ajax.conf b/h5bp/directive-only/cross-domain-ajax.conf
similarity index 100%
rename from h5bp/cross-domain-ajax.conf
rename to h5bp/directive-only/cross-domain-ajax.conf
diff --git a/h5bp/no-transform.conf b/h5bp/directive-only/no-transform.conf
similarity index 100%
rename from h5bp/no-transform.conf
rename to h5bp/directive-only/no-transform.conf
diff --git a/h5bp/x-ua-compatible.conf b/h5bp/directive-only/x-ua-compatible.conf
similarity index 100%
rename from h5bp/x-ua-compatible.conf
rename to h5bp/directive-only/x-ua-compatible.conf
diff --git a/h5bp/h5bp.conf b/h5bp/h5bp.conf
deleted file mode 100644
index 671ae58..0000000
--- a/h5bp/h5bp.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Basic h5bp rules
-
-include h5bp/expires.conf;
-include h5bp/x-ua-compatible.conf;
-include h5bp/cross-domain-fonts.conf;
-include h5bp/protect-system-files.conf;
diff --git a/h5bp/cache-busting.conf b/h5bp/location/cache-busting.conf
similarity index 100%
rename from h5bp/cache-busting.conf
rename to h5bp/location/cache-busting.conf
diff --git a/h5bp/cross-domain-fonts.conf b/h5bp/location/cross-domain-fonts.conf
similarity index 100%
rename from h5bp/cross-domain-fonts.conf
rename to h5bp/location/cross-domain-fonts.conf
diff --git a/h5bp/expires.conf b/h5bp/location/expires.conf
similarity index 100%
rename from h5bp/expires.conf
rename to h5bp/location/expires.conf
diff --git a/h5bp/protect-system-files.conf b/h5bp/location/protect-system-files.conf
similarity index 100%
rename from h5bp/protect-system-files.conf
rename to h5bp/location/protect-system-files.conf
diff --git a/sites-available/example.com b/sites-available/example.com
index 0ae72f2..099f026 100644
--- a/sites-available/example.com
+++ b/sites-available/example.com
@@ -30,6 +30,6 @@ server {
   # Custom 404 page
   error_page 404 /404.html;
 
-  # Include the component config parts for h5bp
-  include h5bp/h5bp.conf;
+  # Include the basic h5bp config set
+  include h5bp/basic.conf;
 }