diff options
| author | Micah Anderson <micah@riseup.net> | 2012-09-25 18:01:54 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2012-09-25 18:02:50 -0400 |
| commit | 58a108f9d0204f76cb880f32a1d093d0fc2ad21f (patch) | |
| tree | 8aeb163b7ec5abec27700038815fd9d48d79570e /templates | |
| parent | f1b77114ac73f2944905b5fdd4d311bc54bd371c (diff) | |
fix variable names that weren't properly pulled in on merge
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/irc_bot/CentOS/nagios-nsa.sh.erb | 4 | ||||
| -rw-r--r-- | templates/irc_bot/Debian/nagios-nsa.sh.erb | 4 | ||||
| -rw-r--r-- | templates/irc_bot/nsa.cfg.erb | 21 |
3 files changed, 14 insertions, 15 deletions
diff --git a/templates/irc_bot/CentOS/nagios-nsa.sh.erb b/templates/irc_bot/CentOS/nagios-nsa.sh.erb index 0f9f87b..ca315b1 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::real_nsa_pidfile') %> -SOCKFILE=<%= scope.lookupvar('nagios::irc_bot::real_nsa_socket') %> +PIDFILE=<%= scope.lookupvar('nagios::irc_bot::base::nsa_pidfile') %> +SOCKFILE=<%= scope.lookupvar('nagios::irc_bot::base::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 43c0e79..7295a37 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::real_nsa_pidfile') %> -SOCKFILE=<%= scope.lookupvar('nagios::irc_bot::real_nsa_socket') %> +PIDFILE=<%= scope.lookupvar('nagios::irc_bot::base::nsa_pidfile') %> +SOCKFILE=<%= scope.lookupvar('nagios::irc_bot::base::nsa_socket') %> . /lib/lsb/init-functions diff --git a/templates/irc_bot/nsa.cfg.erb b/templates/irc_bot/nsa.cfg.erb index 6454e1b..a3bb2b1 100644 --- a/templates/irc_bot/nsa.cfg.erb +++ b/templates/irc_bot/nsa.cfg.erb @@ -1,15 +1,14 @@ %Nsa = ( - 'socket' => '<%= scope.lookupvar('nagios::irc_bot::real_nsa_socket') %>', - 'server' => '<%= scope.lookupvar('nagios::irc_bot::nsa_server') %>', - 'port' => '<%= scope.lookupvar('nagios::irc_bot::nsa_port') %>', - 'nickname' => '<%= scope.lookupvar('nagios::irc_bot::nsa_nickname') %>', - 'password' => '<%= scope.lookupvar('nagios::irc_bot::nsa_password') %>', + 'socket' => '<%= scope.lookupvar('nagios::irc_bot::base::nsa_socket') %>', + 'server' => '<%= scope.lookupvar('nagios::irc_bot::base::nsa_server') %>', + 'port' => '<%= scope.lookupvar('nagios::irc_bot::base::nsa_port') %>', + 'nickname' => '<%= scope.lookupvar('nagios::irc_bot::base::nsa_nickname') %>', + 'password' => '<%= scope.lookupvar('nagios::irc_bot::base::nsa_password') %>', # this needs libio-socket-ssl-perl # doesn't actually works because Net::IRC is braindead and tries to use IO::Socket::SSL->read/write instead of the builtin print, see http://search.cpan.org/dist/IO-Socket-SSL/SSL.pm - #'SSL' => 0, - 'channel' => '<%= scope.lookupvar('nagios::irc_bot::nsa_channel') %>', - 'pidfile' => '<%= scope.lookupvar('nagios::irc_bot::real_nsa_pidfile') %>', # set to undef to disable - 'realname' => "<%= scope.lookupvar('nagios::irc_bot::nsa_realname') %>", - 'realname' => "<%= scope.lookupvar('nagios::irc_bot::nsa_realname') %>", - 'usenotices' => "<%= scope.lookupvar('nagios::irc_bot::nsa_usenotices') %>", + #'SSL' => 0, + 'channel' => '<%= scope.lookupvar('nagios::irc_bot::base::nsa_channel') %>', + 'pidfile' => '<%= scope.lookupvar('nagios::irc_bot::base::nsa_pidfile') %>', # set to undef to disable + 'realname' => '<%= scope.lookupvar('nagios::irc_bot::base::nsa_realname') %>', + 'usenotices' => '<%= scope.lookupvar('nagios::irc_bot::base::nsa_usenotices') %>', ); |