From 7e415a16b2b860fe175752b4a043d9f8dd6993d8 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Tue, 21 Oct 2025 22:12:10 +0200 Subject: [PATCH 1/2] add r10k - temp change - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/286 --- manifests/r10k/install.pp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/manifests/r10k/install.pp b/manifests/r10k/install.pp index 48c8f28..aecc01e 100644 --- a/manifests/r10k/install.pp +++ b/manifests/r10k/install.pp @@ -28,6 +28,19 @@ class puppet_cd::r10k::install ( provider => gem, } + # create r10k dir + file { 'r10k_dir': + ensure => directory, + path => $pt_r10k_dir, + owner => 'root', + group => 'root', + mode => '0755', + selrange => s0, + selrole => object_r, + seltype => puppet_etc_t, + seluser => unconfined_u, + } + # configure r10k.yaml file { $pt_r10k_file: ensure => file, @@ -38,6 +51,7 @@ class puppet_cd::r10k::install ( selrole => object_r, seltype => puppet_etc_t, seluser => unconfined_u, + require => File['r10k_dir'], content => template($pt_r10k_erb), } } From b8538c500ddb8741910938e0bd48d4c4bb85928c Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Tue, 21 Oct 2025 22:13:37 +0200 Subject: [PATCH 2/2] Recommit for updates in build 8 --- .../puppet_cd_3A_3Ar10k_3A_3Ainstall.html | 30 ++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html index 1062bd8..4ee4fd1 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html +++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html @@ -139,7 +139,21 @@ 41 42 43 -44 +44 +45 +46 +47 +48 +49 +50 +51 +52 +53 +54 +55 +56 +57 +58
# File 'manifests/r10k/install.pp', line 6
@@ -169,6 +183,19 @@ class puppet_cd::r10k::install (
       provider => gem,
     }
 
+    # create r10k dir
+    file { 'r10k_dir':
+      ensure   => directory,
+      path     => $pt_r10k_dir,
+      owner    => 'root',
+      group    => 'root',
+      mode     => '0755',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => puppet_etc_t,
+      seluser  => unconfined_u,
+    }
+
     # configure r10k.yaml
     file { $pt_r10k_file:
       ensure   => file,
@@ -179,6 +206,7 @@ class puppet_cd::r10k::install (
       selrole  => object_r,
       seltype  => puppet_etc_t,
       seluser  => unconfined_u,
+      require  => File['r10k_dir'],
       content  => template($pt_r10k_erb),
     }
   }