From bbdcdb729ca44ebbad8c454ddc1b9d8745396502 Mon Sep 17 00:00:00 2001 From: Christoph Maser Date: Mon, 3 Jun 2024 09:56:36 +0200 Subject: [PATCH] raise default version to 1.16.0 this fixes the acceptance tests. But there is a bigger issue here. The code in manifests/init.pp is not idempotent: ``` String[1] $nginx_version = pick(fact('nginx_version'), '1.6.0'), ``` Turns out on the first run the fact might not be set yet leading to a pre 1.15.0 compatible configuration on systems wich ship a newer version of nginx. Leading to ``` nginx: [emerg] unknown directive "ssl" in /etc/nginx/sites-enabled/www.puppetlabs.com.conf:25 ``` --- .rspec | 1 + manifests/init.pp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.rspec b/.rspec index f634583de..c6cfef19f 100644 --- a/.rspec +++ b/.rspec @@ -3,3 +3,4 @@ --format documentation --color +--fail-fast diff --git a/manifests/init.pp b/manifests/init.pp index 2445c100d..82b8001cf 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -240,7 +240,7 @@ Hash $nginx_upstreams = {}, Nginx::UpstreamDefaults $nginx_upstreams_defaults = {}, Boolean $purge_passenger_repo = true, - String[1] $nginx_version = pick(fact('nginx_version'), '1.6.0'), + String[1] $nginx_version = pick(fact('nginx_version'), '1.16.0'), ### END Hiera Lookups ### ) inherits nginx::params {