adding options both for hosts and ips
This commit is contained in:
@@ -41,7 +41,7 @@ class cd_nagios::client::target (
|
|||||||
group => 'nagios',
|
group => 'nagios',
|
||||||
mode => '0664',
|
mode => '0664',
|
||||||
check_command => "check_ping!${ng_ping_warn}!${ng_ping_crit}",
|
check_command => "check_ping!${ng_ping_warn}!${ng_ping_crit}",
|
||||||
notify => Service ['nagios'],
|
notify => Service['nagios'],
|
||||||
}
|
}
|
||||||
|
|
||||||
@@nagios_service { "root_partition_${::hostname}":
|
@@nagios_service { "root_partition_${::hostname}":
|
||||||
|
|||||||
@@ -194,9 +194,12 @@
|
|||||||
# "Send Notification" to be unchecked.
|
# "Send Notification" to be unchecked.
|
||||||
# @param [boolean] ng_use_selinux_tools Whether to enable selinux tools and
|
# @param [boolean] ng_use_selinux_tools Whether to enable selinux tools and
|
||||||
# policies. only effective if selinux is enabled.
|
# policies. only effective if selinux is enabled.
|
||||||
# @param [array] ng_required_hosts Array of FQDNs for hosts which should be
|
# @param [array] ng_required_hosts Array of **__FQDNs__** for hosts which
|
||||||
# allowed/required. every entry in the array creates a new line in the
|
# should be allowed/required. every entry in the array creates a new line in
|
||||||
# configuration file.
|
# the configuration file.
|
||||||
|
# @param [array] ng_required_ips Array of **__Ip addresses __** for hosts which
|
||||||
|
# should be allowed/reqired. every entry in the array creates a new line in
|
||||||
|
# the configuration file
|
||||||
###############################################################################
|
###############################################################################
|
||||||
class cd_nagios::params (
|
class cd_nagios::params (
|
||||||
|
|
||||||
@@ -306,6 +309,7 @@ $ng_use_selinux_tools = true,
|
|||||||
|
|
||||||
# httpd
|
# httpd
|
||||||
$ng_required_hosts = [''],
|
$ng_required_hosts = [''],
|
||||||
|
$ng_required_ips = ['127.0.0.0/8'],
|
||||||
|
|
||||||
) {
|
) {
|
||||||
|
|
||||||
|
|||||||
@@ -19,6 +19,9 @@
|
|||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
# @summary Define manages user- and password rules for accessing nagios.
|
# @summary Define manages user- and password rules for accessing nagios.
|
||||||
|
# @param [string] ng_htpasswd_user user name for the /etc/nagios/passwd file
|
||||||
|
# @param [string] ng_htpasswd_password the encrypted password for the
|
||||||
|
# /etc/nagios/passwd file.
|
||||||
##############################################################################
|
##############################################################################
|
||||||
define cd_nagios::server::access (
|
define cd_nagios::server::access (
|
||||||
|
|
||||||
|
|||||||
@@ -19,10 +19,14 @@ ScriptAlias /nagios/cgi-bin/ "/usr/lib64/nagios/cgi-bin/"
|
|||||||
<IfVersion >= 2.3>
|
<IfVersion >= 2.3>
|
||||||
<RequireAll>
|
<RequireAll>
|
||||||
Require all granted
|
Require all granted
|
||||||
Require local
|
<% if @ng_required_hosts %>
|
||||||
<% @ng_required_hosts.each do |required_host| -%>
|
<% @ng_required_hosts.each do |required_host| -%>
|
||||||
Require host <%= required_host %>
|
Require host <%= required_host %>
|
||||||
<% end -%>
|
<% end end -%>
|
||||||
|
<% if @ng_required_ips %>
|
||||||
|
<% @ng_required_hosts.each do |required_ips| -%>
|
||||||
|
Require ip <%= required_ips %>
|
||||||
|
<% end end -%>
|
||||||
AuthName "Nagios Access"
|
AuthName "Nagios Access"
|
||||||
AuthType Basic
|
AuthType Basic
|
||||||
AuthUserFile /etc/nagios/passwd
|
AuthUserFile /etc/nagios/passwd
|
||||||
@@ -52,11 +56,14 @@ Alias /nagios "/usr/share/nagios/html"
|
|||||||
<IfVersion >= 2.3>
|
<IfVersion >= 2.3>
|
||||||
<RequireAll>
|
<RequireAll>
|
||||||
Require all granted
|
Require all granted
|
||||||
Require local
|
<% if @ng_required_hosts %>
|
||||||
<% @ng_required_hosts.each do |required_host| -%>
|
<% @ng_required_hosts.each do |required_host| -%>
|
||||||
Require host <%= required_host %>
|
Require host <%= required_host %>
|
||||||
<% end -%>
|
<% end end -%>
|
||||||
|
<% if @ng_required_ips %>
|
||||||
|
<% @ng_required_hosts.each do |required_ips| -%>
|
||||||
|
Require ip <%= required_ips %>
|
||||||
|
<% end end -%>
|
||||||
AuthName "Nagios Access"
|
AuthName "Nagios Access"
|
||||||
AuthType Basic
|
AuthType Basic
|
||||||
AuthUserFile /etc/nagios/passwd
|
AuthUserFile /etc/nagios/passwd
|
||||||
|
|||||||
Reference in New Issue
Block a user