Recommit for updates in build 17

doc/puppet_classes/confdroid_prometheus_3A_3Amain_3A_3Adirs.html

@@ -145,20 +145,7 @@
 47
 48
 49
-50
+50</pre>
-51
-52
-53
-54
-55
-56
-57
-58
-59
-60
-61
-62
-63</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/dirs.pp', line 6</span>
@@ -206,19 +193,6 @@ class confdroid_prometheus::main::dirs (
         ensure =&gt; absent,
       }
     }
-    # binary install directory
-    if $install_from_binary == true {
-      file { $ps_install_dir:
-        ensure   =&gt; directory,
-        owner    =&gt; &#39;root&#39;,
-        group    =&gt; &#39;root&#39;,
-        mode     =&gt; &#39;0755&#39;,
-        selrange =&gt; s0,
-        selrole  =&gt; object_r,
-        seltype  =&gt; usr_,
-        seluser  =&gt; unconfined_u,
-      }
-    }
   }
 }</pre>
       </td>

doc/puppet_classes/confdroid_prometheus_3A_3Amain_3A_3Ainstall.html

@@ -114,13 +114,7 @@
 16
 17
 18
-19
+19</pre>
-20
-21
-22
-23
-24
-25</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/install.pp', line 6</span>
@@ -129,16 +123,10 @@ class confdroid_prometheus::main::install (
 ) inherits confdroid_prometheus::params {
   require confdroid_prometheus::main::yumrepo
   if $manage_prometheus  == true {
-    if $install_from_binary == false {
+    package { $reqpackage_prom:
-      package { $reqpackage_prom:
+      ensure =&gt; $pkg_ensure,
-        ensure =&gt; $pkg_ensure,
-      }
-    }
-    if $install_from_binary == true {
-      # place function here to install from binary releases, e.g. using the archive module
     }
   }
-
   if $manage_node_exporter == true {
     package { $reqpackage_ne:
       ensure =&gt; $pkg_ensure,

doc/puppet_classes/confdroid_prometheus_3A_3Aparams.html

@@ -808,24 +808,6 @@
         —
         <div class='inline'>
 <p>the SQL template to use for checks.</p>
-</div>
-      
-    </li>
-  
-    <li>
-      
-        <span class='name'>install_from_binary</span>
-      
-      
-        <span class='type'>(<tt>Boolean</tt>)</span>
-      
-      
-        <em class="default">(defaults to: <tt>false</tt>)</em>
-      
-      
-        &mdash;
-        <div class='inline'>
-<p>whether to install from binary releases instead of packages</p>
 </div>
       
     </li>
@@ -841,6 +823,8 @@
         <pre class="lines">
 
 
+45
+46
 47
 48
 49
@@ -927,13 +911,10 @@
 130
 131
 132
-133
+133</pre>
-134
-135
-136</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 47</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 45</span>
 
 class confdroid_prometheus::params (
 
@@ -941,7 +922,6 @@ class confdroid_prometheus::params (
   String $reqpackage_prom       = &#39;prometheus2&#39;,
   String $reqpackage_ne         = &#39;node_exporter&#39;,
   String $pkg_ensure            = &#39;present&#39;,
-  Boolean $install_from_binary  = false,
 
   # config logic
   Boolean $manage_prometheus    = false,