Merge build 4 into master

doc/puppet_classes/confdroid_jenkins_3A_3Amain_3A_3Ayumrepo.html

@@ -124,8 +124,7 @@
 26
 27
 28
-29
-30</pre>
+29</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/yumrepo.pp', line 6</span>
@@ -137,9 +136,8 @@ class confdroid_jenkins::main::yumrepo (
     yumrepo { &#39;jenkins&#39;:
       descr         =&gt; &#39;Jenkins-stable&#39;,
       baseurl       =&gt; $js_base_url,
-      type          =&gt; &#39;rpm-md&#39;,
       gpgcheck      =&gt; $js_gpg_check,
-      repo_gpgcheck =&gt; 1,
+      repo_gpgcheck =&gt; $js_gpg_repo_check,
       enabled       =&gt; $js_repo_enabled,
     }
 

manifests/main/yumrepo.pp

@@ -10,9 +10,8 @@ class confdroid_jenkins::main::yumrepo (
     yumrepo { 'jenkins':
       descr         => 'Jenkins-stable',
       baseurl       => $js_base_url,
-      type          => 'rpm-md',
       gpgcheck      => $js_gpg_check,
-      repo_gpgcheck => 1,
+      repo_gpgcheck => $js_gpg_repo_check,
       enabled       => $js_repo_enabled,
     }