diff options
| author | Micah Anderson <micah@riseup.net> | 2013-01-24 22:39:45 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-01-24 22:40:40 -0500 |
| commit | 796ea023cd59e04c4662c49bf5a90d800de5d1a6 (patch) | |
| tree | 32d2368947933987bd9cfe128b1df721a9133233 | |
| parent | b141c9b7cd4be9509c2839266c28b2f4da12fc35 (diff) | |
fix merge conflict mess-up
| -rw-r--r-- | templates/irc_bot/CentOS/nagios-nsa.sh.erb | 4 | ||||
| -rw-r--r-- | templates/irc_bot/Debian/nagios-nsa.sh.erb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/templates/irc_bot/CentOS/nagios-nsa.sh.erb b/templates/irc_bot/CentOS/nagios-nsa.sh.erb index ca315b1..0f9f87b 100644 --- a/templates/irc_bot/CentOS/nagios-nsa.sh.erb +++ b/templates/irc_bot/CentOS/nagios-nsa.sh.erb @@ -19,8 +19,8 @@ exec="/usr/local/bin/riseup-nagios-server.pl" prog="nsa" -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') %> [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog 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 |