confdroid/confdroid_apache
3
0
Fork 0
Code Issues Projects Wiki Activity

Recommit for updates in build 9

Browse Source
This commit is contained in:
Jenkins Server
2026-02-03 01:29:37 +01:00
parent 3bffabe3bb
commit cb4a5937b0
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
doc/puppet_classes/confdroid_apache_3A_3Amonitoring_3A_3Atarget.html
View File

@@ -134,12 +134,12 @@ class confdroid_apache::monitoring::target (
false: { notify { 'Nagios Service target for check_httpd has been disabled via parameters / ENC override': } false: { notify { 'Nagios Service target for check_httpd has been disabled via parameters / ENC override': }
} }
default: { default: {
@@nagios_service { "check_http_${::hostname}": @@nagios_service { "check_http_${fqdn}":
check_command => 'check_http', check_command => 'check_http',
use => 'generic-service', use => 'generic-service',
host_name => $::fqdn, host_name => $fqdn,
notification_period => '24x7', notification_period => '24x7',
service_description => "${::hostname}_check_http", service_description => "${fqdn}_check_http",
target => $ae_target_service, target => $ae_target_service,
owner => 'nagios', owner => 'nagios',
group => 'nagios', group => 'nagios',

18
doc/puppet_classes/confdroid_apache_3A_3Aparams.html
View File

@@ -303,7 +303,7 @@ inherited by all classes except defines.
<span class='type'>(<tt>Boolean</tt>)</span> <span class='type'>(<tt>Boolean</tt>)</span>
<em class="default">(defaults to: <tt>true</tt>)</em> <em class="default">(defaults to: <tt>false</tt>)</em>
&mdash; &mdash;
@@ -488,7 +488,13 @@ inherited by all classes except defines.
99 99
100 100
101 101
102</pre> 102
103
104
105
106
107
108</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 46</span> <pre class="code"><span class="info file"># File 'manifests/params.pp', line 46</span>
@@ -505,7 +511,7 @@ class confdroid_apache::params (
Boolean $ae_allow_user_dirs = false, Boolean $ae_allow_user_dirs = false,
# nagios # nagios
Boolean $ae_incl_target = true, Boolean $ae_incl_target = false,
String $ae_target_service = &#39;/etc/nagios/conf.d/httpd_service.cfg&#39;, String $ae_target_service = &#39;/etc/nagios/conf.d/httpd_service.cfg&#39;,
# firewall # firewall
@@ -515,6 +521,12 @@ class confdroid_apache::params (
String $ae_https_port = &#39;443&#39;, String $ae_https_port = &#39;443&#39;,
) { ) {
# facts
$fqdn = $facts[&#39;networking&#39;][&#39;fqdn&#39;]
$domain = $facts[&#39;networking&#39;][&#39;domain&#39;]
$os_name = $facts[&#39;os&#39;][&#39;name&#39;]
$os_release = $facts[&#39;os&#39;][&#39;release&#39;][&#39;major&#39;]
# service # service
$ae_service = &#39;httpd&#39; $ae_service = &#39;httpd&#39;