From 8c3688d6586fab8fd874ba91f7b2140078484624 Mon Sep 17 00:00:00 2001
From: Jeremy Gutierrez <Jeremy.gutierrez@markt.de>
Date: Wed, 18 Jan 2023 14:04:35 +0100
Subject: [PATCH] Fix puppet-lint offenses & change legacy fact with modern
 fact

---
 manifests/backup.pp            | 2 +-
 manifests/instance.pp          | 4 ++--
 manifests/replication.pp       | 2 +-
 manifests/service.pp           | 2 +-
 manifests/ssl.pp               | 2 +-
 spec/acceptance/ds_389_spec.rb | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/manifests/backup.pp b/manifests/backup.pp
index 95357d1..00898f5 100644
--- a/manifests/backup.pp
+++ b/manifests/backup.pp
@@ -88,7 +88,7 @@
     mode      => '0640',
     owner     => $ds_389::user,
     group     => $ds_389::group,
-    content   => inline_epp('<%= $pass %>',{ pass => $root_dn_pass }),
+    content   => inline_epp('<%= $pass %>', { pass => $root_dn_pass }),
     show_diff => false,
   }
 
diff --git a/manifests/instance.pp b/manifests/instance.pp
index 0fc7bfc..9b2ead9 100644
--- a/manifests/instance.pp
+++ b/manifests/instance.pp
@@ -114,7 +114,7 @@
     mode    => '0400',
     owner   => $user,
     group   => $group,
-    content => epp("${module_name}/instance.epp",{
+    content => epp("${module_name}/instance.epp", {
         create_suffix   => $create_suffix,
         group           => $group,
         root_dn         => $root_dn,
@@ -307,7 +307,7 @@
     -> file { "Create CA config: ${server_id}":
       ensure  => 'file',
       name    => $ca_conf,
-      content => epp('ds_389/openssl_ca.cnf.epp',{
+      content => epp('ds_389/openssl_ca.cnf.epp', {
           dc => $facts['networking']['fqdn'],
           cn => $ca_nickname,
       }),
diff --git a/manifests/replication.pp b/manifests/replication.pp
index 90effbd..b5bd549 100644
--- a/manifests/replication.pp
+++ b/manifests/replication.pp
@@ -456,7 +456,7 @@
     mode    => '0440',
     owner   => $user,
     group   => $group,
-    content => epp('ds_389/replication-user.epp',{
+    content => epp('ds_389/replication-user.epp', {
         bind_dn          => $_bind_dn,
         replication_pass => $replication_pass,
         replication_user => $replication_user,
diff --git a/manifests/service.pp b/manifests/service.pp
index a0c551c..1b0baf5 100644
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@ -25,7 +25,7 @@
     file { "/etc/init.d/dirsrv@${name}":
       ensure  => file,
       mode    => '0755',
-      content => epp('ds_389/service-init.epp',{
+      content => epp('ds_389/service-init.epp', {
           name => $name,
       }),
     }
diff --git a/manifests/ssl.pp b/manifests/ssl.pp
index 19db1e3..ea5a3a8 100644
--- a/manifests/ssl.pp
+++ b/manifests/ssl.pp
@@ -93,7 +93,7 @@
     owner   => $user,
     group   => $group,
     mode    => '0440',
-    content => epp('ds_389/ssl.epp',{
+    content => epp('ds_389/ssl.epp', {
         ssl_version_min => $ssl_version_min,
     }),
   }
diff --git a/spec/acceptance/ds_389_spec.rb b/spec/acceptance/ds_389_spec.rb
index 8f6b239..e68de0c 100644
--- a/spec/acceptance/ds_389_spec.rb
+++ b/spec/acceptance/ds_389_spec.rb
@@ -81,7 +81,7 @@ class { 'ds_389':
                     'USERTrust RSA Certification Authority - AddTrust AB',
                     'AddTrust External CA Root - AddTrust AB',
                   ],
-                  'cert_name'      => $::fqdn,
+                  'cert_name'      => $facts['networking']['fqdn'],
                 },
               },
             },