diff options
| author | Micah Anderson <micah@riseup.net> | 2012-09-25 16:27:37 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2012-09-25 16:27:37 -0400 |
| commit | 16e77b3a8b257dafcf059bfcebc095178995fda5 (patch) | |
| tree | 2673fa226de03b0be14ceef4df64140372643ea6 /templates/irc_bot/Debian/nagios-nsa.sh.erb | |
| parent | ad1f714b06faf229ec1b0f310e81c425a6906581 (diff) | |
| parent | eafb4c73ee82915bf83eac01bb26265c531a68e2 (diff) | |
Merge branch 'merge_immerda'
Conflicts:
manifests/apache.pp
this conflict was just a indentation difference.
Diffstat (limited to 'templates/irc_bot/Debian/nagios-nsa.sh.erb')
| -rw-r--r-- | templates/irc_bot/Debian/nagios-nsa.sh.erb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/irc_bot/Debian/nagios-nsa.sh.erb b/templates/irc_bot/Debian/nagios-nsa.sh.erb index c9d1966..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=<%= nagios_nsa_pidfile %> -SOCKFILE=<%= nagios_nsa_socket %> +PIDFILE=<%= scope.lookupvar('nagios::irc_bot::real_nsa_pidfile') %> +SOCKFILE=<%= scope.lookupvar('nagios::irc_bot::real_nsa_socket') %> . /lib/lsb/init-functions |