Skip to content

Commit 32a8ec2

Browse files
onemannoplandependabot[bot]petecooperLeoColomb
authored
Switch to the newest http2 directive (#335)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Pete Cooper <[email protected]> Co-authored-by: Léo Colombaro <[email protected]>
1 parent a935bdb commit 32a8ec2

File tree

3 files changed

+18
-15
lines changed

3 files changed

+18
-15
lines changed

.github/workflows/auto-merge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
steps:
1717
- name: Dependabot metadata
1818
id: dependabot-metadata
19-
uses: dependabot/fetch-metadata@v1.5.0
19+
uses: dependabot/fetch-metadata@v1.6.0
2020
with:
2121
github-token: ${{ secrets.GITHUB_TOKEN }}
2222

README.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![Test](https://github.com/h5bp/server-configs-nginx/workflows/server/badge.svg)](https://github.com/h5bp/server-configs-nginx/actions?query=workflow%3Aserver)
44

5-
**Nginx Server Configs** is a collection of configuration snippets that can help
5+
**Nginx Server Configs** is a collection of configuration files that can help
66
your server improve the website's performance and security, while also
77
ensuring that resources are served with the correct content-type and are
88
accessible, if needed, even cross-domain.
@@ -48,7 +48,7 @@ Most specific variables are:
4848
nginx -s reload
4949
```
5050

51-
### Basic structure
51+
### Repository structure
5252

5353
This repository has the following structure:
5454

@@ -72,44 +72,44 @@ This repository has the following structure:
7272
This directory should contain all the `server` definitions.
7373

7474
Except if they are dot prefixed or non `.conf` extension, all files in this
75-
folder **are** loaded automatically.
75+
directory are loaded automatically.
7676

7777
* **`templates` folder**
7878

79-
Files in this folder contain a `server` template for secure and non-secure hosts.
80-
They are intended to be copied in the `conf.d` folder with all `example.com`
81-
occurrences changed to the target host.
79+
Files in this directory contain a `server` template for secure and non-secure
80+
hosts. They are intended to be copied in the `conf.d` directory with all
81+
`example.com` occurrences changed to the target host.
8282

8383
* **`h5bp/`**
8484

8585
This directory contains config snippets (mixins) to be included as desired.
8686

87-
There are two types of config files provided, individual config snippets and
87+
There are two types of config files provided: individual config snippets and
8888
combined config files which provide convenient defaults.
8989

9090
* **`basic.conf`**
9191

9292
This file loads a small subset of the rules provided by this repository to add
93-
expires headers, allow cross-domain fonts and protect system files from web
93+
`expires` headers, allow cross-domain fonts and protect system files from web
9494
access.
9595
The `basic.conf` file includes the rules which are recommended to always be
9696
defined.
9797

9898
* **`location/`**
9999

100-
Files in this folder contain one or more `location` directives. They are intended
101-
to be loaded in the `server` context (or, in a nested `location` block).
100+
Files in this directory contain one or more `location` directives. They are
101+
intended to be loaded in the `server` context (or, in a nested `location` block).
102102

103103
* **`custom.d/`**
104104

105105
This directory should contain all the custom `nginx.conf` configuration.
106106

107107
Except if they are dot prefixed or non `.conf` extension, all files in this
108-
folder **are** loaded automatically.
108+
folder are loaded automatically.
109109

110110
* **`mime.types`**
111111

112-
The mime.types file is responsible for mapping file extensions to mime types.
112+
The `mime.types` file is responsible for mapping file extensions to MIME types.
113113

114114
* **`nginx.conf`**
115115

conf.d/.default.conf

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,11 @@
1212
server {
1313
listen [::]:443 quic reuseport;
1414
listen 443 quic reuseport;
15-
listen [::]:443 ssl http2 default_server;
16-
listen 443 ssl http2 default_server;
15+
listen [::]:443 ssl default_server;
16+
listen 443 ssl default_server;
17+
18+
http2 on;
19+
http3 on;
1720

1821
server_name _;
1922

0 commit comments

Comments
 (0)