From a85a9386f2d90325a2fe2b40c664e02607cbde3f Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Tue, 28 Oct 2025 13:02:21 +0100 Subject: [PATCH 1/2] add file absence control - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/292 --- manifests/main/files.pp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/manifests/main/files.pp b/manifests/main/files.pp index 6b57620..811a043 100644 --- a/manifests/main/files.pp +++ b/manifests/main/files.pp @@ -32,7 +32,7 @@ class puppet_cd::main::files ( } if $pt_use_puppetdb == true { - # puppetdb.conf + # puppetdb file { $pt_puppetdb_conf_file: ensure => file, path => $pt_puppetdb_conf_file, @@ -53,5 +53,14 @@ class puppet_cd::main::files ( notify => Service[$pt_server_service], } } + + if $pt_use_puppetdb != true { + file { $pt_puppetdb_conf_file: + ensure => absent, + } + file { $pt_routes_file: + ensure => absent, + } + } } } From 16501ec7165ece4d1f26bd2f3f53889e23436746 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Tue, 28 Oct 2025 13:03:36 +0100 Subject: [PATCH 2/2] Recommit for updates in build 93 --- .../puppet_cd_3A_3Amain_3A_3Afiles.html | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html index 6a61f68..3d5f1f1 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html +++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html @@ -152,7 +152,16 @@ 54 55 56 -57 +57 +58 +59 +60 +61 +62 +63 +64 +65 +66
# File 'manifests/main/files.pp', line 6
@@ -186,7 +195,7 @@ class puppet_cd::main::files (
     }
 
     if $pt_use_puppetdb == true {
-      # puppetdb.conf
+      # puppetdb
       file { $pt_puppetdb_conf_file:
         ensure  => file,
         path    => $pt_puppetdb_conf_file,
@@ -207,6 +216,15 @@ class puppet_cd::main::files (
         notify  => Service[$pt_server_service],
       }
     }
+
+    if $pt_use_puppetdb != true {
+      file { $pt_puppetdb_conf_file:
+        ensure  => absent,
+      }
+      file { $pt_routes_file:
+        ensure  => absent,
+      }
+    }
   }
 }