Skip to content

Commit

Permalink
Move src/ to h5bp/
Browse files Browse the repository at this point in the history
Closes h5bp#216
  • Loading branch information
LeoColomb committed Apr 2, 2020
1 parent 796a3e8 commit 9cb2763
Show file tree
Hide file tree
Showing 42 changed files with 65 additions and 65 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -242,21 +242,21 @@ 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

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
Expand Down
62 changes: 31 additions & 31 deletions bin/htaccess.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
60 changes: 30 additions & 30 deletions test/build/htaccess_fixture.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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"

0 comments on commit 9cb2763

Please sign in to comment.