From 796ea023cd59e04c4662c49bf5a90d800de5d1a6 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Thu, 24 Jan 2013 22:39:45 -0500 Subject: fix merge conflict mess-up --- templates/irc_bot/Debian/nagios-nsa.sh.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'templates/irc_bot/Debian/nagios-nsa.sh.erb') diff --git a/templates/irc_bot/Debian/nagios-nsa.sh.erb b/templates/irc_bot/Debian/nagios-nsa.sh.erb index 7295a37..43c0e79 100644 --- a/templates/irc_bot/Debian/nagios-nsa.sh.erb +++ b/templates/irc_bot/Debian/nagios-nsa.sh.erb @@ -9,8 +9,8 @@ # Short-Description: Nagios Simple IRC Agent ### END INIT INFO -PIDFILE=<%= scope.lookupvar('nagios::irc_bot::base::nsa_pidfile') %> -SOCKFILE=<%= scope.lookupvar('nagios::irc_bot::base::nsa_socket') %> +PIDFILE=<%= scope.lookupvar('nagios::irc_bot::real_nsa_pidfile') %> +SOCKFILE=<%= scope.lookupvar('nagios::irc_bot::real_nsa_socket') %> . /lib/lsb/init-functions -- cgit v1.2.3