diff options
| author | Micah Anderson <micah@riseup.net> | 2013-01-23 11:44:05 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-01-23 11:44:05 -0500 |
| commit | 08c3aa9aaf2cc90cfdee2c8191d83f9cede4bf39 (patch) | |
| tree | c29ec1e86efd6eaa84520b37613d847855cedfe2 /templates | |
| parent | 3a1ebac1ed5c34df90bd174f0f269f2f7ac62974 (diff) | |
| parent | 8fd89115cc15295e20234578b45fdecc8bcf1c70 (diff) | |
Merge remote-tracking branch 'shared/master'
Conflicts:
README
manifests/irc_bot.pp
manifests/irc_bot/base.pp
templates/irc_bot/nsa.cfg.erb
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/irc_bot/nsa.cfg.erb | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/templates/irc_bot/nsa.cfg.erb b/templates/irc_bot/nsa.cfg.erb index a3bb2b1..c999c2b 100644 --- a/templates/irc_bot/nsa.cfg.erb +++ b/templates/irc_bot/nsa.cfg.erb @@ -1,14 +1,15 @@ -%Nsa = ( - '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') %>', +%%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') %>', # 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::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') %>', + #'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') %>', ); |