From d13b8c6a54d56f923c60e47fff8128f03f7e4985 Mon Sep 17 00:00:00 2001
From: 12ww1160 <12ww1160@confdroid.com>
Date: Wed, 22 Apr 2026 15:30:53 +0200
Subject: [PATCH 1/2] OP#590 add main dirs

---
 manifests/main/dirs.pp | 48 ++++++++++++++++++++++++++++++++++++++++++
 manifests/params.pp    |  6 ++++++
 2 files changed, 54 insertions(+)

diff --git a/manifests/main/dirs.pp b/manifests/main/dirs.pp
index b2b15c0..638c87c 100644
--- a/manifests/main/dirs.pp
+++ b/manifests/main/dirs.pp
@@ -8,5 +8,53 @@ class confdroid_jenkins::main::dirs (
 ) inherits confdroid_jenkins::params {
   if $fqdn == $js_host_fqdn {
     require confdroid_jenkins::main::install
+
+    # jenkins home
+    file { $js_jenkins_home:
+      ensure   => 'directory',
+      owner    => 'jenkins',
+      group    => 'jenkins',
+      mode     => '0755',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => var_lib_t,
+      seluser  => unconfined_u,
+    }
+
+    # jenkins logs
+    file { $js_jenkins_logs:
+      ensure   => 'directory',
+      owner    => 'jenkins',
+      group    => 'jenkins',
+      mode     => '0755',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => var_log_t,
+      seluser  => unconfined_u,
+    }
+
+    # jenkins cache
+    file { $js_jenkins_cache:
+      ensure   => 'directory',
+      owner    => 'jenkins',
+      group    => 'jenkins',
+      mode     => '0750',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => var_t,
+      seluser  => unconfined_u,
+    }
+
+    # jenkins run
+    file { $js_jenkins_run:
+      ensure   => 'directory',
+      owner    => 'jenkins',
+      group    => 'jenkins',
+      mode     => '0770',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => var_run_t,
+      seluser  => unconfined_u,
+    }
   }
 }
diff --git a/manifests/params.pp b/manifests/params.pp
index e4b747a..38ae135 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -53,6 +53,12 @@ class confdroid_jenkins::params (
   # Service
   $js_service             = 'jenkins'
 
+  # directories
+  $js_jenkins_home        = '/var/lib/jenkins'
+  $js_jenkins_logs        = "${js_jenkins_home}/logs"
+  $js_jenkins_cache       = 'var/cache/jenkins'
+  $js_jenkins_run         = '/run/jenkins'
+
   # includes must be last
   include confdroid_jenkins::main::config
 }

From d7ed416df37e9f19f99a4b9e2e0d6627953a77b2 Mon Sep 17 00:00:00 2001
From: Jenkins Server <jenkins@confdroid.com>
Date: Wed, 22 Apr 2026 15:32:16 +0200
Subject: [PATCH 2/2] Recommit for updates in build 16

---
 ...confdroid_jenkins_3A_3Amain_3A_3Adirs.html | 98 ++++++++++++++++++-
 .../confdroid_jenkins_3A_3Aparams.html        | 14 ++-
 2 files changed, 110 insertions(+), 2 deletions(-)

diff --git a/doc/puppet_classes/confdroid_jenkins_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/confdroid_jenkins_3A_3Amain_3A_3Adirs.html
index a13cbd4..975b6af 100644
--- a/doc/puppet_classes/confdroid_jenkins_3A_3Amain_3A_3Adirs.html
+++ b/doc/puppet_classes/confdroid_jenkins_3A_3Amain_3A_3Adirs.html
@@ -107,7 +107,55 @@
 9
 10
 11
-12</pre>
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/dirs.pp', line 6</span>
@@ -117,6 +165,54 @@ class confdroid_jenkins::main::dirs (
 ) inherits confdroid_jenkins::params {
   if $fqdn == $js_host_fqdn {
     require confdroid_jenkins::main::install
+
+    # jenkins home
+    file { $js_jenkins_home:
+      ensure   =&gt; &#39;directory&#39;,
+      owner    =&gt; &#39;jenkins&#39;,
+      group    =&gt; &#39;jenkins&#39;,
+      mode     =&gt; &#39;0755&#39;,
+      selrange =&gt; s0,
+      selrole  =&gt; object_r,
+      seltype  =&gt; var_lib_t,
+      seluser  =&gt; unconfined_u,
+    }
+
+    # jenkins logs
+    file { $js_jenkins_logs:
+      ensure   =&gt; &#39;directory&#39;,
+      owner    =&gt; &#39;jenkins&#39;,
+      group    =&gt; &#39;jenkins&#39;,
+      mode     =&gt; &#39;0755&#39;,
+      selrange =&gt; s0,
+      selrole  =&gt; object_r,
+      seltype  =&gt; var_log_t,
+      seluser  =&gt; unconfined_u,
+    }
+
+    # jenkins cache
+    file { $js_jenkins_cache:
+      ensure   =&gt; &#39;directory&#39;,
+      owner    =&gt; &#39;jenkins&#39;,
+      group    =&gt; &#39;jenkins&#39;,
+      mode     =&gt; &#39;0750&#39;,
+      selrange =&gt; s0,
+      selrole  =&gt; object_r,
+      seltype  =&gt; var_t,
+      seluser  =&gt; unconfined_u,
+    }
+
+    # jenkins run
+    file { $js_jenkins_run:
+      ensure   =&gt; &#39;directory&#39;,
+      owner    =&gt; &#39;jenkins&#39;,
+      group    =&gt; &#39;jenkins&#39;,
+      mode     =&gt; &#39;0770&#39;,
+      selrange =&gt; s0,
+      selrole  =&gt; object_r,
+      seltype  =&gt; var_run_t,
+      seluser  =&gt; unconfined_u,
+    }
   }
 }</pre>
       </td>
diff --git a/doc/puppet_classes/confdroid_jenkins_3A_3Aparams.html b/doc/puppet_classes/confdroid_jenkins_3A_3Aparams.html
index e1336db..ed9d86c 100644
--- a/doc/puppet_classes/confdroid_jenkins_3A_3Aparams.html
+++ b/doc/puppet_classes/confdroid_jenkins_3A_3Aparams.html
@@ -411,7 +411,13 @@
 55
 56
 57
-58</pre>
+58
+59
+60
+61
+62
+63
+64</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/params.pp', line 20</span>
@@ -452,6 +458,12 @@ class confdroid_jenkins::params (
   # Service
   $js_service             = &#39;jenkins&#39;
 
+  # directories
+  $js_jenkins_home        = &#39;/var/lib/jenkins&#39;
+  $js_jenkins_logs        = &quot;${js_jenkins_home}/logs&quot;
+  $js_jenkins_cache       = &#39;var/cache/jenkins&#39;
+  $js_jenkins_run         = &#39;/run/jenkins&#39;
+
   # includes must be last
   include confdroid_jenkins::main::config
 }</pre>