Recommit for updates in build 20

doc/puppet_classes/confdroid_puppet_3A_3Amain_3A_3Adirs.html

@@ -130,7 +130,21 @@
 32
 33
 34
-35</pre>
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/dirs.pp', line 6</span>
@@ -152,9 +166,9 @@ class confdroid_puppet::main::dirs (
     seluser  =&gt; system_u,
   }
 
-  file { $pt_puppet_dir:
+  file { $pt_puppetdir:
     ensure   =&gt; directory,
-    path     =&gt; $pt_puppet_dir,
+    path     =&gt; $pt_puppetdir,
     owner    =&gt; &#39;root&#39;,
     group    =&gt; &#39;root&#39;,
     mode     =&gt; &#39;0755&#39;,
@@ -164,6 +178,20 @@ class confdroid_puppet::main::dirs (
     seluser  =&gt; system_u,
   }
 
+  if $fqdn == $pt_pm_fqdn {
+    # puppetserver dir
+    file { $pt_server_dir:
+      ensure   =&gt; directory,
+      path     =&gt; $pt_server_dir,
+      owner    =&gt; &#39;puppet&#39;,
+      group    =&gt; &#39;puppet&#39;,
+      mode     =&gt; &#39;0750&#39;,
+      selrange =&gt; s0,
+      selrole  =&gt; object_r,
+      seltype  =&gt; puppet_etc_t,
+      seluser  =&gt; system_u,
+    }
+  }
 }</pre>
       </td>
     </tr>

doc/puppet_classes/confdroid_puppet_3A_3Aparams.html

@@ -1358,7 +1358,8 @@
 219
 220
 221
-222</pre>
+222
+223</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/params.pp', line 69</span>
@@ -1450,6 +1451,7 @@ class confdroid_puppet::params (
   $pt_main_dir                      = &#39;/etc/puppetlabs&#39;
   $pt_puppetdir                     = &quot;${pt_main_dir}/puppet&quot;
   $pt_code_dir                      = &quot;${pt_main_dir}/code&quot;
+  $pt_server_dir                    = &quot;${pt_main_dir}/puppetserver&quot;
   $pt_environmentspath              = &quot;${pt_code_dir}/environments&quot;
   $pt_ssldir                        = &quot;${pt_puppetdir}/ssl&quot;
   $pt_privatekeydir                 = &quot;${pt_ssldir}/private_keys&quot;

manifests/main/dirs.pp

@@ -20,9 +20,9 @@ class confdroid_puppet::main::dirs (
     seluser  => system_u,
   }
 
-  file { $pt_puppet_dir:
+  file { $pt_puppetdir:
     ensure   => directory,
-    path     => $pt_puppet_dir,
+    path     => $pt_puppetdir,
     owner    => 'root',
     group    => 'root',
     mode     => '0755',
@@ -32,4 +32,18 @@ class confdroid_puppet::main::dirs (
     seluser  => system_u,
   }
 
+  if $fqdn == $pt_pm_fqdn {
+    # puppetserver dir
+    file { $pt_server_dir:
+      ensure   => directory,
+      path     => $pt_server_dir,
+      owner    => 'puppet',
+      group    => 'puppet',
+      mode     => '0750',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => puppet_etc_t,
+      seluser  => system_u,
+    }
+  }
 }

manifests/params.pp

@@ -153,6 +153,7 @@ class confdroid_puppet::params (
   $pt_main_dir                      = '/etc/puppetlabs'
   $pt_puppetdir                     = "${pt_main_dir}/puppet"
   $pt_code_dir                      = "${pt_main_dir}/code"
+  $pt_server_dir                    = "${pt_main_dir}/puppetserver"
   $pt_environmentspath              = "${pt_code_dir}/environments"
   $pt_ssldir                        = "${pt_puppetdir}/ssl"
   $pt_privatekeydir                 = "${pt_ssldir}/private_keys"