From b29addf7bb28bb89a9a161f98b9128a25a9fd85c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Colombaro?= <git@colombaro.fr>
Date: Sun, 23 Jul 2023 11:57:47 +0200
Subject: [PATCH] Switch to the newest syntax

---
 .gitignore                               |  2 +-
 conf.d/templates/example.com.conf        | 12 ++++++------
 test/vhosts/default.conf                 |  4 ++--
 test/vhosts/secure.server.localhost.conf |  8 ++++----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4e4a6e1..f91cf7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,4 @@ conf.d/*.conf
 !conf.d/.default.conf
 !conf.d/no-ssl.default.conf
 test/*
-!test/vhosts/
+!test/vhosts
diff --git a/conf.d/templates/example.com.conf b/conf.d/templates/example.com.conf
index 80a2f33..7d2e376 100644
--- a/conf.d/templates/example.com.conf
+++ b/conf.d/templates/example.com.conf
@@ -12,8 +12,8 @@
 server {
   listen [::]:443 quic reuseport;
   listen 443 quic reuseport;
-  listen [::]:443 ssl http2;
-  listen 443 ssl http2;
+  listen [::]:443 ssl;
+  listen 443 ssl;
 
   server_name www.example.com;
 
@@ -28,10 +28,10 @@ server {
 server {
   listen [::]:443 quic reuseport;
   listen 443 quic reuseport;
-  # listen [::]:443 ssl http2 accept_filter=dataready;  # for FreeBSD
-  # listen 443 ssl http2 accept_filter=dataready;  # for FreeBSD
-  listen [::]:443 ssl http2;
-  listen 443 ssl http2;
+  # listen [::]:443 ssl accept_filter=dataready;  # for FreeBSD
+  # listen 443 ssl accept_filter=dataready;  # for FreeBSD
+  listen [::]:443 ssl;
+  listen 443 ssl;
 
   # The host name to respond to
   server_name example.com;
diff --git a/test/vhosts/default.conf b/test/vhosts/default.conf
index d938def..cf7c509 100644
--- a/test/vhosts/default.conf
+++ b/test/vhosts/default.conf
@@ -11,8 +11,8 @@ server {
 server {
   listen [::]:443 quic reuseport;
   listen 443 quic reuseport;
-  listen [::]:443 ssl http2 default_server;
-  listen 443 ssl http2 default_server;
+  listen [::]:443 ssl default_server;
+  listen 443 ssl default_server;
 
   server_name _;
 
diff --git a/test/vhosts/secure.server.localhost.conf b/test/vhosts/secure.server.localhost.conf
index 6db90f2..1645ae8 100644
--- a/test/vhosts/secure.server.localhost.conf
+++ b/test/vhosts/secure.server.localhost.conf
@@ -1,8 +1,8 @@
 server {
   listen [::]:443 quic reuseport;
   listen 443 quic reuseport;
-  listen [::]:443 ssl http2;
-  listen 443 ssl http2;
+  listen [::]:443 ssl;
+  listen 443 ssl;
 
   server_name www.secure.server.localhost;
 
@@ -16,8 +16,8 @@ server {
 server {
   listen [::]:443 quic reuseport;
   listen 443 quic reuseport;
-  listen [::]:443 ssl http2;
-  listen 443 ssl http2;
+  listen [::]:443 ssl;
+  listen 443 ssl;
 
   server_name secure.server.localhost;