Fix incompatibility when setting both quic and so_keepalive (#408)

Author: alessfg

CHANGELOG.md

@@ -1,10 +1,16 @@
 # Changelog
 
+## 0.7.2 (Unreleased)
+
+BUG FIXES:
+
+- Fix incompatibility when using the `listen` directive and setting both the `quic` and `so_keepalive` parameters.
+
 ## 0.7.1 (October 3rd, 2023)
 
 ENHANCEMENTS:
 
-- Implement directives for the `http_v3` module. 
+- Implement directives for the `http_v3` module.
 
 BUG FIXES:
 

defaults/main/template.yml

@@ -206,7 +206,7 @@ nginx_config_http_template:
             port: 80
             default_server: true  # Boolean
             ssl: false  # Boolean
-            quic: false  # Boolean
+            quic: false  # Boolean  # Incompatible with the 'so_keepalive' parameter
             proxy_protocol: false  # Boolean
             fastopen: 12  # Number
             backlog: 511  # Number
@@ -216,7 +216,7 @@ nginx_config_http_template:
             bind: false  # Boolean
             ipv6only: false  # Boolean
             reuseport: false  # Boolean
-            so_keepalive:  # false  # Can alternatively be set to a 'boolean'
+            so_keepalive:  # false  # Can alternatively be set to a 'boolean' -- Incompatible with the 'quic' parameter
               keepidle: 30m
               keepintvl: 5
               keepcnt: 10

molecule/default/converge.yml

@@ -582,14 +582,14 @@
                         ssl: false
                         quic: true
                         reuseport: true
-                        so_keepalive:
-                          keepidle: 30m
-                          keepintvl: 5
-                          keepcnt: 10
                       - address: "[::]"
                         port: 80
                         default_server: true
                         ssl: false
+                        so_keepalive:
+                          keepidle: 30m
+                          keepintvl: 5
+                          keepcnt: 10
                     open_file_cache: false
                     server_name: localhost
                     try_files:

templates/http/core.j2

@@ -153,8 +153,8 @@ listen {{ listen['address'] if listen['address'] is defined }}{{ ':' if listen['
 {{- ' bind' if listen['bind'] is defined and listen['bind'] is boolean and listen['bind'] | bool -}}
 {{- (' ipv6only=' + listen['ipv6only'] | ternary('on', 'off')) if listen['ipv6only'] is defined and listen['ipv6only'] is boolean -}}
 {{- ' reuseport' if (listen['reuseport'] is defined and listen['reuseport'] is boolean and listen['reuseport'] | bool) -}}
-{{- (' so_keepalive=' + listen['so_keepalive'] | ternary('on', 'off')) if listen['so_keepalive'] is defined and listen['so_keepalive'] is boolean -}}
-{{- (' so_keepalive=' + (listen['so_keepalive']['keepidle'] | string if listen['so_keepalive']['keepidle'] is defined) + ':' + (listen['so_keepalive']['keepintvl'] | string if listen['so_keepalive']['keepintvl'] is defined) + ':' + (listen['so_keepalive']['keepcnt'] | string if listen['so_keepalive']['keepcnt'] is defined)) if listen['so_keepalive'] is defined and listen['so_keepalive'] is mapping }};
+{{- (' so_keepalive=' + listen['so_keepalive'] | ternary('on', 'off')) if listen['so_keepalive'] is defined and listen['so_keepalive'] is boolean and listen['quic'] is not defined -}}
+{{- (' so_keepalive=' + (listen['so_keepalive']['keepidle'] | string if listen['so_keepalive']['keepidle'] is defined) + ':' + (listen['so_keepalive']['keepintvl'] | string if listen['so_keepalive']['keepintvl'] is defined) + ':' + (listen['so_keepalive']['keepcnt'] | string if listen['so_keepalive']['keepcnt'] is defined)) if listen['so_keepalive'] is defined and listen['so_keepalive'] is mapping and listen['quic'] is not defined }};
 {% endfor %}
 {% endif %}
 {% if core['log_not_found'] is defined and core['log_not_found'] is boolean %}