From 9cb2763d7f5e3fce984bfdea903e9df61cdf4bcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Colombaro?= Date: Thu, 16 May 2019 00:22:47 +0200 Subject: [PATCH] Move src/ to h5bp/ Closes #216 --- .travis.yml | 2 +- README.md | 6 +- bin/htaccess.conf | 62 +++++++++---------- {src => h5bp}/basic.conf | 0 {src => h5bp}/cross-origin/images.conf | 0 {src => h5bp}/cross-origin/requests.conf | 0 .../cross-origin/resource_timing.conf | 0 {src => h5bp}/cross-origin/web_fonts.conf | 0 {src => h5bp}/errors/custom_errors.conf | 0 {src => h5bp}/errors/error_prevention.conf | 0 .../internet_explorer/x-ua-compatible.conf | 0 .../media_types/character_encodings.conf | 0 {src => h5bp}/media_types/media_types.conf | 0 {src => h5bp}/rewrites/rewrite_engine.conf | 0 .../rewrites/rewrite_http_to_https.conf | 0 {src => h5bp}/rewrites/rewrite_nowww.conf | 0 {src => h5bp}/rewrites/rewrite_www.conf | 0 .../security/content-security-policy.conf | 0 {src => h5bp}/security/file_access.conf | 0 {src => h5bp}/security/referrer-policy.conf | 0 .../security/server_software_information.conf | 0 .../security/strict-transport-security.conf | 0 {src => h5bp}/security/trace_method.conf | 0 .../security/x-content-type-options.conf | 0 {src => h5bp}/security/x-frame-options.conf | 0 {src => h5bp}/security/x-powered-by.conf | 0 {src => h5bp}/security/x-xss-protection.conf | 0 {src => h5bp}/ssl/certificate_files.conf | 0 {src => h5bp}/ssl/ocsp_stapling.conf | 0 {src => h5bp}/ssl/policy_deprecated.conf | 0 {src => h5bp}/ssl/policy_intermediate.conf | 0 {src => h5bp}/ssl/policy_modern.conf | 0 {src => h5bp}/ssl/ssl_engine.conf | 0 .../web_performance/cache_expiration.conf | 0 .../web_performance/compression.conf | 0 .../content_transformation.conf | 0 {src => h5bp}/web_performance/etags.conf | 0 .../web_performance/file_concatenation.conf | 0 .../filename-based_cache_busting.conf | 0 .../pre-compressed_content_brotli.conf | 0 .../pre-compressed_content_gzip.conf | 0 test/build/htaccess_fixture.conf | 60 +++++++++--------- 42 files changed, 65 insertions(+), 65 deletions(-) rename {src => h5bp}/basic.conf (100%) rename {src => h5bp}/cross-origin/images.conf (100%) rename {src => h5bp}/cross-origin/requests.conf (100%) rename {src => h5bp}/cross-origin/resource_timing.conf (100%) rename {src => h5bp}/cross-origin/web_fonts.conf (100%) rename {src => h5bp}/errors/custom_errors.conf (100%) rename {src => h5bp}/errors/error_prevention.conf (100%) rename {src => h5bp}/internet_explorer/x-ua-compatible.conf (100%) rename {src => h5bp}/media_types/character_encodings.conf (100%) rename {src => h5bp}/media_types/media_types.conf (100%) rename {src => h5bp}/rewrites/rewrite_engine.conf (100%) rename {src => h5bp}/rewrites/rewrite_http_to_https.conf (100%) rename {src => h5bp}/rewrites/rewrite_nowww.conf (100%) rename {src => h5bp}/rewrites/rewrite_www.conf (100%) rename {src => h5bp}/security/content-security-policy.conf (100%) rename {src => h5bp}/security/file_access.conf (100%) rename {src => h5bp}/security/referrer-policy.conf (100%) rename {src => h5bp}/security/server_software_information.conf (100%) rename {src => h5bp}/security/strict-transport-security.conf (100%) rename {src => h5bp}/security/trace_method.conf (100%) rename {src => h5bp}/security/x-content-type-options.conf (100%) rename {src => h5bp}/security/x-frame-options.conf (100%) rename {src => h5bp}/security/x-powered-by.conf (100%) rename {src => h5bp}/security/x-xss-protection.conf (100%) rename {src => h5bp}/ssl/certificate_files.conf (100%) rename {src => h5bp}/ssl/ocsp_stapling.conf (100%) rename {src => h5bp}/ssl/policy_deprecated.conf (100%) rename {src => h5bp}/ssl/policy_intermediate.conf (100%) rename {src => h5bp}/ssl/policy_modern.conf (100%) rename {src => h5bp}/ssl/ssl_engine.conf (100%) rename {src => h5bp}/web_performance/cache_expiration.conf (100%) rename {src => h5bp}/web_performance/compression.conf (100%) rename {src => h5bp}/web_performance/content_transformation.conf (100%) rename {src => h5bp}/web_performance/etags.conf (100%) rename {src => h5bp}/web_performance/file_concatenation.conf (100%) rename {src => h5bp}/web_performance/filename-based_cache_busting.conf (100%) rename {src => h5bp}/web_performance/pre-compressed_content_brotli.conf (100%) rename {src => h5bp}/web_performance/pre-compressed_content_gzip.conf (100%) diff --git a/.travis.yml b/.travis.yml index e24d9eba..f5c7b5df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ jobs: -v $TRAVIS_BUILD_DIR/test/fixtures:/usr/local/apache2/htdocs \ -v $TRAVIS_BUILD_DIR/test/vhosts:/usr/local/apache2/vhosts \ -v $TRAVIS_BUILD_DIR/test/certs:/usr/local/apache2/certs \ - -v $TRAVIS_BUILD_DIR/src:/usr/local/apache2/h5bp \ + -v $TRAVIS_BUILD_DIR/h5bp:/usr/local/apache2/h5bp \ -v $TRAVIS_BUILD_DIR/httpd.conf:/usr/local/apache2/conf/httpd.conf \ httpd script: ./test/bin/k6 run test/lib/index.js -e TESTS=basic-file-access:cache-busting:custom-errors:forbidden-files:enforce-gzip:precompressed-files-gzip:rewrites:ssl diff --git a/README.md b/README.md index 7ed345e1..05c724b1 100644 --- a/README.md +++ b/README.md @@ -242,13 +242,13 @@ For example, the *“Cross-origin web fonts”* snippet is always included in ou This will comment out the section: ``` -disable "src/cross-origin/web_fonts.conf" +disable "h5bp/cross-origin/web_fonts.conf" ``` …and this will exclude the section, saving lines in output: ``` -omit "src/cross-origin/web_fonts.conf" +omit "h5bp/cross-origin/web_fonts.conf" ``` #### Enabling modules @@ -256,7 +256,7 @@ omit "src/cross-origin/web_fonts.conf" For example, the *“Forcing https://”* snippet is disabled by default, although being included in our pre-built `.htaccess`. To enable this snippet, change the **disable** keyword to **enable:** ``` -enable "src/rewrites/rewrite_http_to_https.conf" +enable "h5bp/rewrites/rewrite_http_to_https.conf" ``` #### Adding custom modules diff --git a/bin/htaccess.conf b/bin/htaccess.conf index e93db8dc..9de8f64f 100644 --- a/bin/htaccess.conf +++ b/bin/htaccess.conf @@ -25,70 +25,70 @@ # Module "cross-origin" title "cross-origin" -disable "src/cross-origin/requests.conf" -enable "src/cross-origin/images.conf" -enable "src/cross-origin/web_fonts.conf" -disable "src/cross-origin/resource_timing.conf" +disable "h5bp/cross-origin/requests.conf" +enable "h5bp/cross-origin/images.conf" +enable "h5bp/cross-origin/web_fonts.conf" +disable "h5bp/cross-origin/resource_timing.conf" # Module "errors" title "errors" -disable "src/errors/custom_errors.conf" -enable "src/errors/error_prevention.conf" +disable "h5bp/errors/custom_errors.conf" +enable "h5bp/errors/error_prevention.conf" # Module "internet explorer" title "internet explorer" -enable "src/internet_explorer/x-ua-compatible.conf" +enable "h5bp/internet_explorer/x-ua-compatible.conf" # Module "media types and character encodings" title "media types and character encodings" -enable "src/media_types/media_types.conf" -enable "src/media_types/character_encodings.conf" +enable "h5bp/media_types/media_types.conf" +enable "h5bp/media_types/character_encodings.conf" # Module "rewrites" title "rewrites" -enable "src/rewrites/rewrite_engine.conf" -disable "src/rewrites/rewrite_http_to_https.conf" -enable "src/rewrites/rewrite_nowww.conf" -disable "src/rewrites/rewrite_www.conf" +enable "h5bp/rewrites/rewrite_engine.conf" +disable "h5bp/rewrites/rewrite_http_to_https.conf" +enable "h5bp/rewrites/rewrite_nowww.conf" +disable "h5bp/rewrites/rewrite_www.conf" # Module "security" title "security" -disable "src/security/x-frame-options.conf" -disable "src/security/content-security-policy.conf" -enable "src/security/file_access.conf" -disable "src/security/strict-transport-security.conf" -enable "src/security/x-content-type-options.conf" -disable "src/security/x-xss-protection.conf" -disable "src/security/referrer-policy.conf" -disable "src/security/trace_method.conf" -enable "src/security/x-powered-by.conf" -enable "src/security/server_software_information.conf" +disable "h5bp/security/x-frame-options.conf" +disable "h5bp/security/content-security-policy.conf" +enable "h5bp/security/file_access.conf" +disable "h5bp/security/strict-transport-security.conf" +enable "h5bp/security/x-content-type-options.conf" +disable "h5bp/security/x-xss-protection.conf" +disable "h5bp/security/referrer-policy.conf" +disable "h5bp/security/trace_method.conf" +enable "h5bp/security/x-powered-by.conf" +enable "h5bp/security/server_software_information.conf" # Module "web performance" title "web performance" -enable "src/web_performance/compression.conf" -disable "src/web_performance/pre-compressed_content_brotli.conf" -disable "src/web_performance/pre-compressed_content_gzip.conf" -disable "src/web_performance/content_transformation.conf" -enable "src/web_performance/etags.conf" -enable "src/web_performance/cache_expiration.conf" -disable "src/web_performance/file_concatenation.conf" -disable "src/web_performance/filename-based_cache_busting.conf" +enable "h5bp/web_performance/compression.conf" +disable "h5bp/web_performance/pre-compressed_content_brotli.conf" +disable "h5bp/web_performance/pre-compressed_content_gzip.conf" +disable "h5bp/web_performance/content_transformation.conf" +enable "h5bp/web_performance/etags.conf" +enable "h5bp/web_performance/cache_expiration.conf" +disable "h5bp/web_performance/file_concatenation.conf" +disable "h5bp/web_performance/filename-based_cache_busting.conf" diff --git a/src/basic.conf b/h5bp/basic.conf similarity index 100% rename from src/basic.conf rename to h5bp/basic.conf diff --git a/src/cross-origin/images.conf b/h5bp/cross-origin/images.conf similarity index 100% rename from src/cross-origin/images.conf rename to h5bp/cross-origin/images.conf diff --git a/src/cross-origin/requests.conf b/h5bp/cross-origin/requests.conf similarity index 100% rename from src/cross-origin/requests.conf rename to h5bp/cross-origin/requests.conf diff --git a/src/cross-origin/resource_timing.conf b/h5bp/cross-origin/resource_timing.conf similarity index 100% rename from src/cross-origin/resource_timing.conf rename to h5bp/cross-origin/resource_timing.conf diff --git a/src/cross-origin/web_fonts.conf b/h5bp/cross-origin/web_fonts.conf similarity index 100% rename from src/cross-origin/web_fonts.conf rename to h5bp/cross-origin/web_fonts.conf diff --git a/src/errors/custom_errors.conf b/h5bp/errors/custom_errors.conf similarity index 100% rename from src/errors/custom_errors.conf rename to h5bp/errors/custom_errors.conf diff --git a/src/errors/error_prevention.conf b/h5bp/errors/error_prevention.conf similarity index 100% rename from src/errors/error_prevention.conf rename to h5bp/errors/error_prevention.conf diff --git a/src/internet_explorer/x-ua-compatible.conf b/h5bp/internet_explorer/x-ua-compatible.conf similarity index 100% rename from src/internet_explorer/x-ua-compatible.conf rename to h5bp/internet_explorer/x-ua-compatible.conf diff --git a/src/media_types/character_encodings.conf b/h5bp/media_types/character_encodings.conf similarity index 100% rename from src/media_types/character_encodings.conf rename to h5bp/media_types/character_encodings.conf diff --git a/src/media_types/media_types.conf b/h5bp/media_types/media_types.conf similarity index 100% rename from src/media_types/media_types.conf rename to h5bp/media_types/media_types.conf diff --git a/src/rewrites/rewrite_engine.conf b/h5bp/rewrites/rewrite_engine.conf similarity index 100% rename from src/rewrites/rewrite_engine.conf rename to h5bp/rewrites/rewrite_engine.conf diff --git a/src/rewrites/rewrite_http_to_https.conf b/h5bp/rewrites/rewrite_http_to_https.conf similarity index 100% rename from src/rewrites/rewrite_http_to_https.conf rename to h5bp/rewrites/rewrite_http_to_https.conf diff --git a/src/rewrites/rewrite_nowww.conf b/h5bp/rewrites/rewrite_nowww.conf similarity index 100% rename from src/rewrites/rewrite_nowww.conf rename to h5bp/rewrites/rewrite_nowww.conf diff --git a/src/rewrites/rewrite_www.conf b/h5bp/rewrites/rewrite_www.conf similarity index 100% rename from src/rewrites/rewrite_www.conf rename to h5bp/rewrites/rewrite_www.conf diff --git a/src/security/content-security-policy.conf b/h5bp/security/content-security-policy.conf similarity index 100% rename from src/security/content-security-policy.conf rename to h5bp/security/content-security-policy.conf diff --git a/src/security/file_access.conf b/h5bp/security/file_access.conf similarity index 100% rename from src/security/file_access.conf rename to h5bp/security/file_access.conf diff --git a/src/security/referrer-policy.conf b/h5bp/security/referrer-policy.conf similarity index 100% rename from src/security/referrer-policy.conf rename to h5bp/security/referrer-policy.conf diff --git a/src/security/server_software_information.conf b/h5bp/security/server_software_information.conf similarity index 100% rename from src/security/server_software_information.conf rename to h5bp/security/server_software_information.conf diff --git a/src/security/strict-transport-security.conf b/h5bp/security/strict-transport-security.conf similarity index 100% rename from src/security/strict-transport-security.conf rename to h5bp/security/strict-transport-security.conf diff --git a/src/security/trace_method.conf b/h5bp/security/trace_method.conf similarity index 100% rename from src/security/trace_method.conf rename to h5bp/security/trace_method.conf diff --git a/src/security/x-content-type-options.conf b/h5bp/security/x-content-type-options.conf similarity index 100% rename from src/security/x-content-type-options.conf rename to h5bp/security/x-content-type-options.conf diff --git a/src/security/x-frame-options.conf b/h5bp/security/x-frame-options.conf similarity index 100% rename from src/security/x-frame-options.conf rename to h5bp/security/x-frame-options.conf diff --git a/src/security/x-powered-by.conf b/h5bp/security/x-powered-by.conf similarity index 100% rename from src/security/x-powered-by.conf rename to h5bp/security/x-powered-by.conf diff --git a/src/security/x-xss-protection.conf b/h5bp/security/x-xss-protection.conf similarity index 100% rename from src/security/x-xss-protection.conf rename to h5bp/security/x-xss-protection.conf diff --git a/src/ssl/certificate_files.conf b/h5bp/ssl/certificate_files.conf similarity index 100% rename from src/ssl/certificate_files.conf rename to h5bp/ssl/certificate_files.conf diff --git a/src/ssl/ocsp_stapling.conf b/h5bp/ssl/ocsp_stapling.conf similarity index 100% rename from src/ssl/ocsp_stapling.conf rename to h5bp/ssl/ocsp_stapling.conf diff --git a/src/ssl/policy_deprecated.conf b/h5bp/ssl/policy_deprecated.conf similarity index 100% rename from src/ssl/policy_deprecated.conf rename to h5bp/ssl/policy_deprecated.conf diff --git a/src/ssl/policy_intermediate.conf b/h5bp/ssl/policy_intermediate.conf similarity index 100% rename from src/ssl/policy_intermediate.conf rename to h5bp/ssl/policy_intermediate.conf diff --git a/src/ssl/policy_modern.conf b/h5bp/ssl/policy_modern.conf similarity index 100% rename from src/ssl/policy_modern.conf rename to h5bp/ssl/policy_modern.conf diff --git a/src/ssl/ssl_engine.conf b/h5bp/ssl/ssl_engine.conf similarity index 100% rename from src/ssl/ssl_engine.conf rename to h5bp/ssl/ssl_engine.conf diff --git a/src/web_performance/cache_expiration.conf b/h5bp/web_performance/cache_expiration.conf similarity index 100% rename from src/web_performance/cache_expiration.conf rename to h5bp/web_performance/cache_expiration.conf diff --git a/src/web_performance/compression.conf b/h5bp/web_performance/compression.conf similarity index 100% rename from src/web_performance/compression.conf rename to h5bp/web_performance/compression.conf diff --git a/src/web_performance/content_transformation.conf b/h5bp/web_performance/content_transformation.conf similarity index 100% rename from src/web_performance/content_transformation.conf rename to h5bp/web_performance/content_transformation.conf diff --git a/src/web_performance/etags.conf b/h5bp/web_performance/etags.conf similarity index 100% rename from src/web_performance/etags.conf rename to h5bp/web_performance/etags.conf diff --git a/src/web_performance/file_concatenation.conf b/h5bp/web_performance/file_concatenation.conf similarity index 100% rename from src/web_performance/file_concatenation.conf rename to h5bp/web_performance/file_concatenation.conf diff --git a/src/web_performance/filename-based_cache_busting.conf b/h5bp/web_performance/filename-based_cache_busting.conf similarity index 100% rename from src/web_performance/filename-based_cache_busting.conf rename to h5bp/web_performance/filename-based_cache_busting.conf diff --git a/src/web_performance/pre-compressed_content_brotli.conf b/h5bp/web_performance/pre-compressed_content_brotli.conf similarity index 100% rename from src/web_performance/pre-compressed_content_brotli.conf rename to h5bp/web_performance/pre-compressed_content_brotli.conf diff --git a/src/web_performance/pre-compressed_content_gzip.conf b/h5bp/web_performance/pre-compressed_content_gzip.conf similarity index 100% rename from src/web_performance/pre-compressed_content_gzip.conf rename to h5bp/web_performance/pre-compressed_content_gzip.conf diff --git a/test/build/htaccess_fixture.conf b/test/build/htaccess_fixture.conf index 87dc8487..398ae366 100644 --- a/test/build/htaccess_fixture.conf +++ b/test/build/htaccess_fixture.conf @@ -24,69 +24,69 @@ # Module "cross-origin" title "cross-origin" -omit "src/cross-origin/requests.conf" -enable "src/cross-origin/images.conf" -enable "src/cross-origin/web_fonts.conf" -enable "src/cross-origin/resource_timing.conf" +omit "h5bp/cross-origin/requests.conf" +enable "h5bp/cross-origin/images.conf" +enable "h5bp/cross-origin/web_fonts.conf" +enable "h5bp/cross-origin/resource_timing.conf" # Module "errors" title "errors" -enable "src/errors/custom_errors.conf" -enable "src/errors/error_prevention.conf" +enable "h5bp/errors/custom_errors.conf" +enable "h5bp/errors/error_prevention.conf" # Module "internet explorer" title "internet explorer" -enable "src/internet_explorer/x-ua-compatible.conf" +enable "h5bp/internet_explorer/x-ua-compatible.conf" # Module "media types and character encodings" title "media types and character encodings" -enable "src/media_types/media_types.conf" -enable "src/media_types/character_encodings.conf" +enable "h5bp/media_types/media_types.conf" +enable "h5bp/media_types/character_encodings.conf" # Module "rewrites" title "rewrites" -enable "src/rewrites/rewrite_engine.conf" -omit "src/rewrites/rewrite_http_to_https.conf" -enable "src/rewrites/rewrite_nowww.conf" +enable "h5bp/rewrites/rewrite_engine.conf" +omit "h5bp/rewrites/rewrite_http_to_https.conf" +enable "h5bp/rewrites/rewrite_nowww.conf" # Module "security" title "security" -enable "src/security/x-frame-options.conf" -enable "src/security/content-security-policy.conf" -enable "src/security/file_access.conf" -enable "src/security/strict-transport-security.conf" -enable "src/security/x-content-type-options.conf" -enable "src/security/x-xss-protection.conf" -enable "src/security/referrer-policy.conf" -omit "src/security/trace_method.conf" -enable "src/security/x-powered-by.conf" -enable "src/security/server_software_information.conf" +enable "h5bp/security/x-frame-options.conf" +enable "h5bp/security/content-security-policy.conf" +enable "h5bp/security/file_access.conf" +enable "h5bp/security/strict-transport-security.conf" +enable "h5bp/security/x-content-type-options.conf" +enable "h5bp/security/x-xss-protection.conf" +enable "h5bp/security/referrer-policy.conf" +omit "h5bp/security/trace_method.conf" +enable "h5bp/security/x-powered-by.conf" +enable "h5bp/security/server_software_information.conf" # Module "web performance" title "web performance" -enable "src/web_performance/compression.conf" -enable "src/web_performance/pre-compressed_content_brotli.conf" -enable "src/web_performance/pre-compressed_content_gzip.conf" -enable "src/web_performance/content_transformation.conf" -enable "src/web_performance/etags.conf" -enable "src/web_performance/cache_expiration.conf" -enable "src/web_performance/file_concatenation.conf" -enable "src/web_performance/filename-based_cache_busting.conf" +enable "h5bp/web_performance/compression.conf" +enable "h5bp/web_performance/pre-compressed_content_brotli.conf" +enable "h5bp/web_performance/pre-compressed_content_gzip.conf" +enable "h5bp/web_performance/content_transformation.conf" +enable "h5bp/web_performance/etags.conf" +enable "h5bp/web_performance/cache_expiration.conf" +enable "h5bp/web_performance/file_concatenation.conf" +enable "h5bp/web_performance/filename-based_cache_busting.conf"