From b37864c7a366affc4a2214d712161e2eb136b5f6 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Fri, 21 Jul 2017 13:15:47 +0100 Subject: [PATCH] testing options both for hosts and ips --- Jenkinsfile | 2 ++ templates/httpd/nagios_conf.erb | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e88dff1..0973ded 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -202,6 +202,8 @@ Changelog of Git Changelog. } } + + stage('recommit changes to repo') { steps { sshagent(['0c22dc63-2ae0-4ad5-98e0-65aa0f0f411g']) { diff --git a/templates/httpd/nagios_conf.erb b/templates/httpd/nagios_conf.erb index 8337061..7ca0f6c 100644 --- a/templates/httpd/nagios_conf.erb +++ b/templates/httpd/nagios_conf.erb @@ -19,11 +19,11 @@ ScriptAlias /nagios/cgi-bin/ "/usr/lib64/nagios/cgi-bin/" = 2.3> Require all granted -<% if @ng_required_hosts != '' -%> +<% if @ng_required_hosts != [] -%> <% @ng_required_hosts.each do |required_host| -%> Require host <%= required_host %> <% end end -%> -<% if @ng_required_ips != '' -%> +<% if @ng_required_ips != [] -%> <% @ng_required_ips.each do |required_ips| -%> Require ip <%= required_ips %> <% end end -%> @@ -56,11 +56,11 @@ Alias /nagios "/usr/share/nagios/html" = 2.3> Require all granted -<% if @ng_required_hosts != '' -%> +<% if @ng_required_hosts != [] -%> <% @ng_required_hosts.each do |required_host| -%> Require host <%= required_host %> <% end end -%> -<% if @ng_required_ips != '' %> +<% if @ng_required_ips [] -%> <% @ng_required_ips.each do |required_ips| -%> Require ip <%= required_ips %> <% end end -%>