Recommit for updates in build 17
This commit is contained in:
@@ -145,20 +145,7 @@
|
||||
47
|
||||
48
|
||||
49
|
||||
50
|
||||
51
|
||||
52
|
||||
53
|
||||
54
|
||||
55
|
||||
56
|
||||
57
|
||||
58
|
||||
59
|
||||
60
|
||||
61
|
||||
62
|
||||
63</pre>
|
||||
50</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 => absent,
|
||||
}
|
||||
}
|
||||
# binary install directory
|
||||
if $install_from_binary == true {
|
||||
file { $ps_install_dir:
|
||||
ensure => directory,
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0755',
|
||||
selrange => s0,
|
||||
selrole => object_r,
|
||||
seltype => usr_,
|
||||
seluser => unconfined_u,
|
||||
}
|
||||
}
|
||||
}
|
||||
}</pre>
|
||||
</td>
|
||||
|
||||
@@ -114,13 +114,7 @@
|
||||
16
|
||||
17
|
||||
18
|
||||
19
|
||||
20
|
||||
21
|
||||
22
|
||||
23
|
||||
24
|
||||
25</pre>
|
||||
19</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:
|
||||
ensure => $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 => $pkg_ensure,
|
||||
|
||||
@@ -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>
|
||||
|
||||
|
||||
—
|
||||
<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
|
||||
134
|
||||
135
|
||||
136</pre>
|
||||
133</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 = 'prometheus2',
|
||||
String $reqpackage_ne = 'node_exporter',
|
||||
String $pkg_ensure = 'present',
|
||||
Boolean $install_from_binary = false,
|
||||
|
||||
# config logic
|
||||
Boolean $manage_prometheus = false,
|
||||
|
||||
Reference in New Issue
Block a user