Merge remote-tracking branch 'origin/master' into jenkins-build-16

doc/puppet_classes/confdroid_puppet_3A_3Amain_3A_3Adirs.html

@@ -117,20 +117,7 @@
 19
 20
 21
-22
+22</pre>
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33
-34
-35</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/dirs.pp', line 6</span>
@@ -151,19 +138,6 @@ class confdroid_puppet::main::dirs (
     seltype  =&gt; puppet_etc_t,
     seluser  =&gt; system_u,
   }
-
-  file { $pt_puppet_dir:
-    ensure   =&gt; directory,
-    path     =&gt; $pt_puppet_dir,
-    owner    =&gt; &#39;root&#39;,
-    group    =&gt; &#39;root&#39;,
-    mode     =&gt; &#39;0755&#39;,
-    selrange =&gt; s0,
-    selrole  =&gt; object_r,
-    seltype  =&gt; puppet_etc_t,
-    seluser  =&gt; system_u,
-  }
-
 }</pre>
       </td>
     </tr>

manifests/main/dirs.pp

@@ -19,17 +19,4 @@ class confdroid_puppet::main::dirs (
     seltype  => puppet_etc_t,
     seluser  => system_u,
   }
-
-  file { $pt_puppet_dir:
-    ensure   => directory,
-    path     => $pt_puppet_dir,
-    owner    => 'root',
-    group    => 'root',
-    mode     => '0755',
-    selrange => s0,
-    selrole  => object_r,
-    seltype  => puppet_etc_t,
-    seluser  => system_u,
-  }
-
 }