Merge pull request #24 from h5bp/move-config

Move config files
2013-11-25 03:39:43 -08:00 · 2013-11-25 03:39:43 -08:00 · f8578ec325
parent d2fe435cc8 560bdab9cf
commit f8578ec325
11 changed files with 8 additions and 8 deletions
--- a/h5bp/basic.conf
+++ 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;
--- a/h5bp/directive-only/cache-file-descriptors.conf
+++ b/h5bp/directive-only/cache-file-descriptors.conf
--- a/h5bp/directive-only/cross-domain-ajax.conf
+++ b/h5bp/directive-only/cross-domain-ajax.conf
--- a/h5bp/directive-only/no-transform.conf
+++ b/h5bp/directive-only/no-transform.conf
--- a/h5bp/directive-only/x-ua-compatible.conf
+++ b/h5bp/directive-only/x-ua-compatible.conf
--- a/h5bp/h5bp.conf
+++ b/h5bp/h5bp.conf
@ -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;
--- a/h5bp/location/cache-busting.conf
+++ b/h5bp/location/cache-busting.conf
--- a/h5bp/location/cross-domain-fonts.conf
+++ b/h5bp/location/cross-domain-fonts.conf
--- a/h5bp/location/expires.conf
+++ b/h5bp/location/expires.conf
--- a/h5bp/location/protect-system-files.conf
+++ b/h5bp/location/protect-system-files.conf
--- 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;
 }