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 ```
voxpupuli · Jun 3, 2024 · 7e779c6 · 7e779c6
1 parent bbfff0a
commit 7e779c6
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 10 deletions.
diff --git a/.rspec b/.rspec
@@ -3,3 +3,4 @@
 
 --format documentation
 --color
+--fail-fast
diff --git a/REFERENCE.md b/REFERENCE.md
@@ -281,7 +281,7 @@ already installed.  If the fact is unavailable, it defaults to '1.6.0'.
 You may need to set this manually to get a working and idempotent
 configuration.
 
-Default value: `pick(fact('nginx_version'), '1.6.0')`
+Default value: `pick(fact('nginx_version'), '1.16.0')`
 
 ##### <a name="-nginx--debug_connections"></a>`debug_connections`
 

diff --git 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 {

diff --git a/spec/acceptance/nginx_mail_spec.rb b/spec/acceptance/nginx_mail_spec.rb
@@ -80,7 +80,7 @@ class { 'nginx':
       it { is_expected.to be_listening }
     end
 
-    context 'when configured for nginx 1.14' do
+    context 'when configured for nginx 1.14', if: !%w[Debian Archlinux].include?(fact('os.family')) do
       it 'runs successfully' do
         pp = "
       if fact('os.family') == 'RedHat' {

diff --git a/spec/classes/nginx_spec.rb b/spec/classes/nginx_spec.rb
@@ -189,13 +189,8 @@
             let(:params) { { package_source: 'passenger' } }
 
             it { is_expected.to contain_package('nginx') }
+            it { is_expected.to contain_package('libnginx-mod-http-passenger') }
 
-            if (facts.dig(:os, 'name') == 'Debian' && %w[11].include?(facts.dig(:os, 'release', 'major'))) ||
-               (facts.dig(:os, 'name') == 'Ubuntu' && %w[bionic focal jammy].include?(facts.dig(:os, 'distro', 'codename')))
-              it { is_expected.to contain_package('libnginx-mod-http-passenger') }
-            else
-              it { is_expected.to contain_package('passenger') }
-            end
             it do
               is_expected.to contain_apt__source('nginx').with(
                 'location' => 'https://oss-binaries.phusionpassenger.com/apt/passenger',

diff --git a/spec/defines/resource_server_spec.rb b/spec/defines/resource_server_spec.rb
@@ -672,7 +672,7 @@
                 facts[:nginx_version] ? facts.delete(:nginx_version) : facts
               end
 
-              it { is_expected.to contain_concat__fragment("#{title}-ssl-header").with_content(%r{  ssl on;}) }
+              it { is_expected.to contain_concat__fragment("#{title}-ssl-header").with_content(%r{listen       \*:443 ssl;}) }
             end
 
             context 'with fact nginx_version=1.14.1' do
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,3 +3,4 @@

		--format documentation
		--color
		--fail-fast