From 990d34b1ef64dadbdd1e5924820fb069b424fa3d Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Wed, 23 Jan 2013 11:04:33 -0500 Subject: minor template formatting fix that seemed to have gone missing in a conflict merge --- templates/irc_bot/nsa.cfg.erb | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'templates/irc_bot/nsa.cfg.erb') diff --git a/templates/irc_bot/nsa.cfg.erb b/templates/irc_bot/nsa.cfg.erb index 5dd7d0e..c999c2b 100644 --- a/templates/irc_bot/nsa.cfg.erb +++ b/templates/irc_bot/nsa.cfg.erb @@ -1,15 +1,15 @@ %%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::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') %>', # 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') %>", - 'usenotices' => "<%= scope.lookupvar('nagios::irc_bot::nsa_usenotices') %>", - 'commandfile' => "<%= scope.lookupvar('nagios::irc_bot::real_nsa_commandfile') %>", + #'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') %>', + 'usenotices' => '<%= scope.lookupvar('nagios::irc_bot::nsa_usenotices') %>', + 'commandfile' => '<%= scope.lookupvar('nagios::irc_bot::real_nsa_commandfile') %>', ); -- cgit v1.2.3