Skip to content

Commit 7a25ea0

Browse files
authored
Merge pull request #381 from voxpupuli/puppet8
2 parents aa57089 + c6240da commit 7a25ea0

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
"requirements": [
104104
{
105105
"name": "puppet",
106-
"version_requirement": ">= 7.0.0 < 8.0.0"
106+
"version_requirement": ">= 7.0.0 < 9.0.0"
107107
}
108108
],
109109
"pdk-version": "1.15.0",

spec/acceptance/openldap__server_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ class { 'openldap::server': }
2525
it 'with cert, key and ca' do
2626
pp = <<-EOS
2727
class { 'openldap::server':
28-
ssl_key => "/etc/ldap/ssl/${::fqdn}.key",
29-
ssl_cert => "/etc/ldap/ssl/${::fqdn}.crt",
28+
ssl_key => "/etc/ldap/ssl/${facts['networking']['fqdn']}.key",
29+
ssl_cert => "/etc/ldap/ssl/${facts['networking']['fqdn']}.crt",
3030
ssl_ca => '/etc/ldap/ssl/ca.pem',
3131
}
3232
EOS
@@ -54,8 +54,8 @@ class { 'openldap::server':
5454
pp = <<-EOS
5555
class { 'openldap::server':
5656
ldaps_ifs => ['/'],
57-
ssl_key => "/etc/ldap/ssl/${::fqdn}.key",
58-
ssl_cert => "/etc/ldap/ssl/${::fqdn}.crt",
57+
ssl_key => "/etc/ldap/ssl/${facts['networking']['fqdn']}.key",
58+
ssl_cert => "/etc/ldap/ssl/${facts['networking']['fqdn']}.crt",
5959
ssl_ca => '/etc/ldap/ssl/ca.pem',
6060
}
6161
EOS

0 commit comments

Comments
 (0)