diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-05-09 14:06:23 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-05-09 14:06:23 -0300 |
| commit | 2b4e5bed7c9d85c0f65733be6ef6dc799a8d1261 (patch) | |
| tree | 5810915bd56d85410a549ef1df917ced5242b04f | |
| parent | 2a18612ad452d93347bbf8c602cff63821cea843 (diff) | |
| download | puppet-qwebirc-2b4e5bed7c9d85c0f65733be6ef6dc799a8d1261.tar.gz puppet-qwebirc-2b4e5bed7c9d85c0f65733be6ef6dc799a8d1261.tar.bz2 | |
Adding webirc_password
| -rw-r--r-- | manifests/init.pp | 2 | ||||
| -rw-r--r-- | templates/config.py.erb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 31c099e..4431751 100644 --- 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 b2dd998..0feb9f2 100644 --- 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. |