From d86fda3514a439c3db76aed87cf55f94d8b409d7 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Sat, 18 Oct 2025 14:39:07 +0200 Subject: [PATCH 1/2] fix dirs - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/260 --- manifests/main/dirs.pp | 2 +- manifests/params.pp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/manifests/main/dirs.pp b/manifests/main/dirs.pp index dfbd93c..d751001 100644 --- a/manifests/main/dirs.pp +++ b/manifests/main/dirs.pp @@ -19,7 +19,7 @@ class prometheus_cd::main::dirs ( seluser => system_u, } # data directory - file { $ps_data_dir, + file { $ps_data_dir: ensure => directory, owner => 'prometheus', group => 'prometheus', diff --git a/manifests/params.pp b/manifests/params.pp index a41f820..9e54376 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -13,6 +13,7 @@ # @param [String] ps_main_port the firewall main port for prometheus # @param [String] ps_auth_user the username for authentication # @param [String] ps_auth_pass the password for authentication +# @param [String] ps_data_dir the data directory for prometheus ############################################################################## class prometheus_cd::params ( From 9222c8195942d50d6379bcfab556635d4fb4f17d Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Sat, 18 Oct 2025 14:40:13 +0200 Subject: [PATCH 2/2] Recommit for updates in build 23 --- doc/_index.html | 5 ++++ doc/puppet_class_list.html | 17 ++++++++---- .../prometheus_cd_3A_3Amain_3A_3Adirs.html | 26 ++++++++++++++++++- .../prometheus_cd_3A_3Aparams.html | 13 +++++++--- 4 files changed, 52 insertions(+), 9 deletions(-) diff --git a/doc/_index.html b/doc/_index.html index bd8f09f..6846631 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -83,6 +83,11 @@ +
  • + prometheus_cd::main::dirs + +
    • +
  • prometheus_cd::main::files diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html index 834be82..01e58be 100644 --- a/doc/puppet_class_list.html +++ b/doc/puppet_class_list.html @@ -57,35 +57,42 @@
    • -
  • +
  • +
    + prometheus_cd::main::dirs +
    +
    • + + +
  • prometheus_cd::main::files
    • -
  • +
  • prometheus_cd::main::install
    • -
  • +
  • prometheus_cd::main::service
    • -
  • +
  • prometheus_cd::main::yumrepo
    • -
  • +
  • prometheus_cd::params
    diff --git a/doc/puppet_classes/prometheus_cd_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/prometheus_cd_3A_3Amain_3A_3Adirs.html index 71f5c23..2716267 100644 --- a/doc/puppet_classes/prometheus_cd_3A_3Amain_3A_3Adirs.html +++ b/doc/puppet_classes/prometheus_cd_3A_3Amain_3A_3Adirs.html @@ -116,7 +116,19 @@ 18 19 20 -21 +21 +22 +23 +24 +25 +26 +27 +28 +29 +30 +31 +32 +33 
    # File 'manifests/main/dirs.pp', line 6
@@ -125,6 +137,7 @@ class prometheus_cd::main::dirs (
 ) inherits prometheus_cd::params {
   require prometheus_cd::main::install
   if ($ps_prom_host == $fqdn) and ($manage_prometheus == true)  {
+    # prometheus directors
     file { $ps_main_dir:
       ensure   => directory,
       owner    => 'root',
@@ -135,6 +148,17 @@ class prometheus_cd::main::dirs (
       seltype  => etc_t,
       seluser  => system_u,
     }
+    # data directory
+    file { $ps_data_dir:
+      ensure   => directory,
+      owner    => 'prometheus',
+      group    => 'prometheus',
+      mode     => '0750',
+#      selrange => s0,
+#      selrole  => object_r,
+#      seltype  => etc_t,
+#      seluser  => system_u,
+    }
   }
 }
    diff --git a/doc/puppet_classes/prometheus_cd_3A_3Aparams.html b/doc/puppet_classes/prometheus_cd_3A_3Aparams.html index 4059ab2..7945501 100644 --- a/doc/puppet_classes/prometheus_cd_3A_3Aparams.html +++ b/doc/puppet_classes/prometheus_cd_3A_3Aparams.html @@ -67,6 +67,8 @@
    Inherited by:
    + prometheus_cd::main::dirs
    + prometheus_cd::main::files
    prometheus_cd::main::config
    @@ -317,6 +319,11 @@ (defaults to: '/data/prometheus') + — +
    +

    the data directory for prometheus

    +
    +
    • @@ -330,7 +337,6 @@ 
     
 
-17
 18
 19
 20
@@ -371,10 +377,11 @@
 55
 56
 57
-58
    +58 +59 - 
    # File 'manifests/params.pp', line 17
+        
    # File 'manifests/params.pp', line 18
 
 class prometheus_cd::params (