Merge branch 'master' of github.com:h5bp/server-configs-nginx

* 'master' of github.com:h5bp/server-configs-nginx: (92 commits)
  Additional compression method added for gzip (h5bp#236)
  Bump server-config-test to 1.2.1
  Switch tertiary DNS used for OCSP checking to OpenDNS (h5bp#235)
  Revert "Drop Cache-Control: no-transform usage"
  Release v3.1.0
  Fix CHANGELOG formatting
  Use generic `$host` instead of host name
  Pre-compressed content usage config files
  Fix rebase artifacts
  Documentation formatting and reviewing (h5bp#232)
  Fix 304 responses Cache-control override
  Fix dropped Cache-Control: no-transform usage for SVGZ Compression
  Bump server-configs-test to v1.1.0
  Improve wording and file headers
  Drop Cache-Control: no-transform usage
  Add Google Public DNS IPv6 and Cloudflare DNS IP addresses to `resolver` (h5bp#229)
  Fix misc typos in comments (h5bp#228)
  Update README.md
  Fix typo in example conf (h5bp#226)
  Improve default Content-Security-Policy value (h5bp#224)
  ...

.editorconfig

@@ -0,0 +1,18 @@
+# For more information about the properties used in
+# this file, please see the EditorConfig documentation:
+# https://editorconfig.org/
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+# Markdown uses the trailing whitespaces
+# https://daringfireball.net/projects/markdown/syntax#block
+trim_trailing_whitespace = false

.gitattributes

@@ -0,0 +1,19 @@
+# Automatically normalize line endings for all text-based files
+# https://git-scm.com/docs/gitattributes#_end_of_line_conversion
+
+* text=auto
+
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+# Make GitHub's language statistics treat the `*.conf` files as
+# Nginx configuration files
+#
+# https://github.com/github/linguist/blob/master/README.md
+
+*.conf linguist-language=Nginx
+
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+.travis.yml     export-ignore
+/.git*          export-ignore
+/test           export-ignore

.github/CODEOWNERS

@@ -0,0 +1,3 @@
+# https://help.github.com/articles/about-codeowners/
+
+* @h5bp/server-configs-nginx

.github/CODE_OF_CONDUCT.md

@@ -0,0 +1 @@
+Please read [Code of Conduct for H5BP](https://github.com/h5bp/html5-boilerplate/blob/master/.github/CODE_OF_CONDUCT.md)

CONTRIBUTING.md → .github/CONTRIBUTING.md

@@ -1,10 +1,14 @@
 # Contributing to Nginx Server Configs
 
+♥ [Nginx Server Configs](https://github.com/h5bp/server-configs-nginx) and
+want to get involved? Thanks! We're actively looking for folks interested in
+helping out and there are plenty of ways you can help!
+
 Please take a moment to review this document in order to make the contribution
 process easy and effective for everyone involved.
 
-Following these guidelines helps to communicate that you respect the time
-of the developers managing and developing this open source project. In return,
+Following these guidelines helps to communicate that you respect the time of
+the developers managing and developing this open source project. In return,
 they should reciprocate that respect in addressing your issue or assessing
 patches and features.
 
@@ -17,7 +21,7 @@ and [submitting pull requests](#pull-requests), but please respect the following
 restrictions:
 
 * Please **do not** use the issue tracker for personal support requests (use
-  [Stack Overflow](http://stackoverflow.com) or IRC).
+  [Stack Overflow](https://stackoverflow.com) or IRC).
 
 * Please **do not** derail or troll issues. Keep the discussion on topic and
   respect the opinions of others.
@@ -38,7 +42,7 @@ Guidelines for bug reports:
    latest `master` or development branch in the repository.
 
 3. **Isolate the problem** — ideally create a [reduced test
-   case](http://css-tricks.com/6263-reduced-test-cases/) and a live example.
+   case](https://css-tricks.com/reduced-test-cases/) and a live example.
 
 A good bug report shouldn't leave others needing to chase you up for more
 information. Please try to be as detailed as possible in your report. What is
@@ -76,8 +80,9 @@ provide as much detail and context as possible.
 <a name="pull-requests"></a>
 ## Pull requests
 
-Good pull requests - patches, improvements, new features - are a fantastic help.
-They should remain focused in scope and avoid containing unrelated commits.
+Good pull requests - patches, improvements, new features - are a fantastic
+help. They should remain focused in scope and avoid containing unrelated
+commits.
 
 **Please ask first** before embarking on any significant pull request (e.g.
 implementing features, refactoring code), otherwise you risk spending a lot of
@@ -87,11 +92,11 @@ into the project.
 Please adhere to the coding conventions used throughout a project (indentation,
 accurate comments, etc.) and any other requirements (such as test coverage).
 
-Adhering to the following this process is the best way to get your work
+Adhering to the following process is the best way to get your work
 included in the project:
 
-1. [Fork](http://help.github.com/fork-a-repo/) the project, clone your fork,
-   and configure the remotes:
+1. [Fork](https://help.github.com/articles/fork-a-repo/) the project, clone your
+   fork, and configure the remotes:
 
    ```bash
    # Clone your fork of the repo into the current directory
@@ -117,9 +122,9 @@ included in the project:
    ```
 
 4. Commit your changes in logical chunks. Please adhere to these [git commit
-   message guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
+   message guidelines](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
    or your code is unlikely be merged into the main project. Use Git's
-   [interactive rebase](https://help.github.com/articles/interactive-rebase)
+   [interactive rebase](https://help.github.com/articles/about-git-rebase/)
    feature to tidy up your commits before making them public.
 
 5. Locally merge (or rebase) the upstream development branch into your topic branch:
@@ -137,5 +142,5 @@ included in the project:
 7. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/)
     with a clear title and description.
 
-**IMPORTANT**: By submitting a patch, you agree to allow the project owner to
-license your work under the same license as that used by the project.
+**IMPORTANT**: By submitting a patch, you agree to allow the project
+owners to license your work under the terms of the [MIT License](../LICENSE.txt).

.gitignore

@@ -1,2 +1,8 @@
 locals.conf
-sites-enabled/*
+/logs/
+/conf.d/*.conf
+!/conf.d/.default.conf
+!/conf.d/no-ssl.default.conf
+/test/*
+!/test/vhosts/
+/k6/

.travis.yml

@@ -0,0 +1,41 @@
+# https://docs.travis-ci.com/
+
+language: minimal
+
+services:
+  - docker
+
+addons:
+  hosts:
+    - server.localhost
+    - www-server.localhost
+    - www.server.localhost
+    - secure.server.localhost
+    - www.secure.server.localhost
+  apt:
+    packages:
+      - docker-ce
+
+install:
+  - curl -sSL https://github.com/h5bp/server-configs-test/releases/download/1.2.1/server-configs-test.tar.gz | tar -xz -C test/
+
+before_script:
+  - docker pull nginx
+  - |
+    docker run -d -p 80:80 -p 443:443 --name server \
+      -v $TRAVIS_BUILD_DIR/test/fixtures:/var/www/server.localhost \
+      -v $TRAVIS_BUILD_DIR/test/vhosts:/etc/nginx/conf.d \
+      -v $TRAVIS_BUILD_DIR/test/certs:/etc/nginx/certs \
+      -v $TRAVIS_BUILD_DIR/h5bp:/etc/nginx/h5bp \
+      -v $TRAVIS_BUILD_DIR/nginx.conf:/etc/nginx/nginx.conf \
+      -v $TRAVIS_BUILD_DIR/mime.types:/etc/nginx/mime.types \
+      nginx
+
+script:
+  - ./test/bin/k6 run test/lib/index.js -e TESTS=basic-file-access:caching:cache-busting:custom-errors:forbidden-files:precompressed-files-gzip:rewrites:ssl
+
+after_success: ./test/bin/k6 run test/lib/benchmark.js
+
+after_failure:
+  - docker ps -a
+  - docker logs server

CHANGELOG.md

@@ -1,5 +1,61 @@
-2.0.0 (2017-05-06)
-------------------
+### 3.1.0 (May 19, 2019)
+
+* Drop `Cache-Control: no-transform` usage
+  [[282d979](https://github.com/h5bp/server-configs-nginx/commit/282d979af40f34dccb852df9dcbecd42b899ef18)]
+* Disable cache expiration for empty content-type resources
+  [[c73d1ef](https://github.com/h5bp/server-configs-nginx/commit/c73d1efb60e834c57c6343745415c4b58418c934)]
+* Remove Content-Security-Policy from `basic.conf` includes
+  [[29ff09a](https://github.com/h5bp/server-configs-nginx/commit/29ff09ac950d40dd525e1b438ab2ecaf0a4be96f)]
+* Improve default Content-Security-Policy values
+  [[276af8d](https://github.com/h5bp/server-configs-nginx/commit/276af8da7bdf7c7d3708bbe5190092194b307789)]
+* Add more common DNS resolver addresses to default `resolver`
+  [[28874c3](https://github.com/h5bp/server-configs-nginx/commit/28874c33f0e778fc7687f5b3926590ce09e06c98)]
+* Pre-compressed content usage config files
+  [[8db768b](https://github.com/h5bp/server-configs-nginx/commit/8db768bd61094ad814bb56b8a2a560ccc416aef0)]
+* Improve inline comments.
+
+### 3.0.1 (March 09, 2019)
+
+* Use regexp in MIME-types based maps
+  [[d65cd97](https://github.com/h5bp/server-configs-nginx/commit/d65cd977618ede702f15e084cb0f4a152e204935)]
+  [[db1601f](https://github.com/h5bp/server-configs-nginx/commit/db1601f6064fd7d3d822618cf2e069a6b0cb8e9f)]
+* Fix SVGZ compression handling
+  [[cec616a](https://github.com/h5bp/server-configs-nginx/commit/cec616a103345ccef418a16549adee60f650cf52)]
+* Add Referrer-Policy for html document by default
+  [[f600128](https://github.com/h5bp/server-configs-nginx/commit/f600128203e6319d6f3ce02e2538bf65b0ed01ea)]
+
+### 3.0.0 (February 12, 2019)
+
+* ⚠️ **Breaking**: Drop support for Nginx version < 1.8.0
+  [[1f5d635](https://github.com/h5bp/server-configs-nginx/commit/1f5d6359be53e90b634ea0451b121cfbeffa4b63)]
+* ⚠️ **Breaking**: Switch from `sites-enabled`/`available` to `conf.d`
+  [[306af36](https://github.com/h5bp/server-configs-nginx/commit/306af367e97a5f177b8bc479cef416fef2508732)]
+* ⚠️ **Breaking**: Refactor `h5bp/` directives to strict atomic structure
+  [[496af1c](https://github.com/h5bp/server-configs-nginx/commit/496af1cfd535d472d8bbd2db0a322f988803741b)]
+  [[2d13505](https://github.com/h5bp/server-configs-nginx/commit/2d135053cbd96e1e74884e4395c3163b8a39602f)]
+* ⚠️ **Breaking**: Refactor and modernize TLS/SSL directives
+  [[1b2b4eb...d2531ac](https://github.com/h5bp/server-configs-nginx/compare/1b2b4eb...d2531ac)]
+* ⚠️ **Breaking**: Move common header directives from location directives to mapped values based on MIME-types
+  [[6dd4cc2](https://github.com/h5bp/server-configs-nginx/commit/6dd4cc27edafc26e73d8998ab146235774d4abdc)]
+* 🎉 Tests! Add tests and configure continuous integration to help community contributions
+  [[52e1353](https://github.com/h5bp/server-configs-nginx/commit/52e13535b46ca862d1a51d083d7696eb964fe82b)]
+* Replace location block `add_header` directives with `expires` directives
+  [[135d093](https://github.com/h5bp/server-configs-nginx/commit/135d093a7505a72810156760b23b1f03e18c8b0a)]
+* Support hashed asset names
+  [[1b2b4eb](https://github.com/h5bp/server-configs-nginx/commit/1b2b4eb2766e3be99f30c65c86c265fc07edcdad)]
+* Update many values in MIME-types table
+  [[62dbd41](https://github.com/h5bp/server-configs-nginx/commit/62dbd41aeefb063be761741098a2584f1019f586)]
+  [[08272b6](https://github.com/h5bp/server-configs-nginx/commit/08272b63c2c9d0f875480a62caa615fe20387ad7)]
+  [[9c6aad8](https://github.com/h5bp/server-configs-nginx/commit/9c6aad83a509cb9dc72cacf17a54281326dd9ca9)]
+  [[b244111](https://github.com/h5bp/server-configs-nginx/commit/b244111468ce69218acad08ccc4b79c43f88c8c9)]
+  [[94262e7](https://github.com/h5bp/server-configs-nginx/commit/94262e76103a2f69d3f66b4e92c0c0ebb3cd486b)]
+  [[b244111](https://github.com/h5bp/server-configs-nginx/commit/b244111468ce69218acad08ccc4b79c43f88c8c9)]
+  [[fe7ff95](https://github.com/h5bp/server-configs-nginx/commit/fe7ff95a7fc96315a9022f4d02c11e6264b1bb1c)]
+* Remove outdated `inline` script
+  [[8a4a1ce](https://github.com/h5bp/server-configs-nginx/commit/8a4a1ce706eb90d820f6a2ccaa23f5f55e6c056e)]
+* Improve inline comments and review documentation.
+
+### 2.0.0 (2017-05-06)
 
 - V2.0.0. [AD7six]
 
@@ -390,8 +446,7 @@
 
 - Correct bad link. [Andy Dawson]
 
-1.0.0 (2014-10-24)
-------------------
+### 1.0.0 (2014-10-24)
 
 - V1.0.0. [AD7six]
 

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) Nginx Server Configs
+Copyright (c) H5BP
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in