From 32da5faa192dc00f781bdb679aafbc0f41ac180d Mon Sep 17 00:00:00 2001 From: "Christian G. Warden" Date: Wed, 1 Feb 2012 16:56:49 -0800 Subject: Fully qualify facter variables to suppress warnings merge conflict due to immerda's branch not being up-to-date on the bot --- manifests/irc_bot/base.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/irc_bot') diff --git a/manifests/irc_bot/base.pp b/manifests/irc_bot/base.pp index c36d8e6..ee3ea39 100644 --- a/manifests/irc_bot/base.pp +++ b/manifests/irc_bot/base.pp @@ -36,7 +36,7 @@ class nagios::irc_bot::base { } file { "/etc/init.d/nagios-nsa": owner => root, group => 0, mode => 0755, - content => template("nagios/irc_bot/${operatingsystem}/nagios-nsa.sh.erb"), + content => template("nagios/irc_bot/${::operatingsystem}/nagios-nsa.sh.erb"), require => File["/usr/local/bin/riseup-nagios-server.pl"], } file { "/etc/nagios_nsa.cfg": -- cgit v1.2.3