Skip to content

Commit f3d1758

Browse files
committed
drop support for Debian 10
there is already breaking changes on master, so next releease will be major test have been broken for a while and will be fixed in #1596
1 parent 7f3a8ae commit f3d1758

File tree

5 files changed

+19
-8
lines changed

5 files changed

+19
-8
lines changed

REFERENCE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3080,7 +3080,7 @@ Create a new mapping entry for NGINX
30803080
nginx::resource::map { 'backend_pool':
30813081
ensure => present,
30823082
hostnames => true,
3083-
default => 'ny-pool-1,
3083+
default => 'ny-pool-1',
30843084
string => '$http_host',
30853085
mappings => {
30863086
'*.nyc.example.com' => 'ny-pool-1',

metadata.json

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
{
2828
"operatingsystem": "Debian",
2929
"operatingsystemrelease": [
30-
"10",
3130
"11"
3231
]
3332
},

spec/acceptance/class_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
pkg_cmd = 'dpkg -s nginx | grep ^Maintainer'
2020
pkg_remove_cmd = 'apt-get -y purge nginx nginx-common'
2121
pkg_match = case fact('operatingsystemmajrelease')
22-
when '10', '11'
22+
when '11'
2323
%r{Debian Nginx Maintainers}
2424
when '18.04', '20.04', '22.04'
2525
%r{Ubuntu Developers}

spec/acceptance/nginx_server_spec.rb

+16-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@ class { 'nginx': }
1111
ensure => present,
1212
www_root => '/var/www/www.puppetlabs.com',
1313
}
14-
host { 'www.puppetlabs.com': ip => '127.0.0.1', }
14+
file_line {'mock hosts':
15+
path => '/etc/hosts',
16+
line => '127.0.0.1 www.puppetlabs.com'
17+
}
1518
file { ['/var/www','/var/www/www.puppetlabs.com']: ensure => directory }
1619
file { '/var/www/www.puppetlabs.com/index.html': ensure => file, content => 'Hello from www\n', }
1720
"
@@ -65,7 +68,10 @@ class { 'nginx': }
6568
ssl_key => '/etc/pki/tls/private/blah.key',
6669
www_root => '/var/www/www.puppetlabs.com',
6770
}
68-
host { 'www.puppetlabs.com': ip => '127.0.0.1', }
71+
file_line {'mock hosts':
72+
path => '/etc/hosts',
73+
line => '127.0.0.1 www.puppetlabs.com'
74+
}
6975
file { ['/var/www','/var/www/www.puppetlabs.com']: ensure => directory }
7076
file { '/var/www/www.puppetlabs.com/index.html': ensure => file, content => 'Hello from www\n', }
7177
"
@@ -131,7 +137,10 @@ class { 'nginx': }
131137
ssl_password_file => '/etc/pki/tls/private/crypted.pass',
132138
www_root => '/var/www/www.puppetlabs.com',
133139
}
134-
host { 'www.puppetlabs.com': ip => '127.0.0.1', }
140+
file_line {'mock hosts':
141+
path => '/etc/hosts',
142+
line => '127.0.0.1 www.puppetlabs.com'
143+
}
135144
file { ['/var/www','/var/www/www.puppetlabs.com']: ensure => directory }
136145
file { '/var/www/www.puppetlabs.com/index.html': ensure => file, content => 'Hello from www\n', }
137146
"
@@ -187,7 +196,10 @@ class { 'nginx': }
187196
ssl => false,
188197
server => ['www.puppetlabs.com'],
189198
}
190-
host { 'www.puppetlabs.com': ip => '127.0.0.1', }
199+
file_line {'mock hosts':
200+
path => '/etc/hosts',
201+
line => '127.0.0.1 www.puppetlabs.com'
202+
}
191203
file { ['/var/www','/var/www/www.puppetlabs.com','/var/www/letsencrypt','/var/www/letsencrypt/.well-known','/var/www/letsencrypt/.well-known/acme-challenge']: ensure => directory }
192204
file { '/var/www/www.puppetlabs.com/index.html': ensure => file, content => 'Hello from www\n', }
193205
file { '/var/www/letsencrypt/.well-known/acme-challenge/fb9bd98604be3d0c7d589fcc7561cb41': ensure => file, content => 'LetsEncrypt\n', }

spec/classes/nginx_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@
190190

191191
it { is_expected.to contain_package('nginx') }
192192

193-
if (facts.dig(:os, 'name') == 'Debian' && %w[10 11].include?(facts.dig(:os, 'release', 'major'))) ||
193+
if (facts.dig(:os, 'name') == 'Debian' && %w[11].include?(facts.dig(:os, 'release', 'major'))) ||
194194
(facts.dig(:os, 'name') == 'Ubuntu' && %w[bionic focal jammy].include?(facts.dig(:os, 'distro', 'codename')))
195195
it { is_expected.to contain_package('libnginx-mod-http-passenger') }
196196
else

0 commit comments

Comments
 (0)