Adding webirc_password

diff --git a/manifests/init.pp b/manifests/init.pp
index 31c099e9ecba53199cd6a7707a0cb0dad5bbde18..443175153634a0dafbc2eb70bbc46a2b7d48ffb7 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -2,7 +2,7 @@
 class qwebirc($ircserver = 'irc.myserver.com', $ircport = '6667', $realname = 'http://moo.com/',
               $webirc_mode = 'None', $base_url = 'http://foo.foo.org/', $network_name = 'FooNet',
               $sslport = false, $feedback_from = 'moo@moo.com', $feedback_to = 'moo@moo.com',
-              $sslfingerprint = false) {
+              $sslfingerprint = false, $webirc_password = false) {
 
   package { [ 'python-twisted', 'python-openssl', 'python-simplejson', 'mercurial' ]:
     ensure => present,

diff --git a/templates/config.py.erb b/templates/config.py.erb
index b2dd998a555bb9614fd27b771e03003754fa8609..0feb9f20d64024546695857b72c8548065d9a35f 100644 (file)
--- a/templates/config.py.erb
+++ b/templates/config.py.erb
@@ -85,7 +85,9 @@ WEBIRC_MODE = <%= webirc_mode %>
 # OPTION: WEBIRC_PASSWORD
 #         Used for WEBIRC_MODE webirc and cgiirc, see WEBIRC_MODE
 #         option documentation.
-#WEBIRC_PASSWORD = "fish"
+<%- if webirc_password != false -%>
+WEBIRC_PASSWORD = "<%= webirc_password -%>"
+<%- end %>
 
 # OPTION: CGIIRC_STRING
 #         Command sent to IRC server in for cgiirc WEBIRC_MODE.