summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-05-09 18:07:02 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-05-09 18:07:02 -0300
commitba9b00f64061f45da0f7d7730e89ab8307e2c421 (patch)
tree67f6dc54d89d3673cd509c52ac584535ba0829fe
parente4048f469bfb6f503a53f9803933b2053abdf75a (diff)
downloadpuppet-qwebirc-master.tar.gz
puppet-qwebirc-master.tar.bz2
Changing default value for args parameterHEADmaster
-rw-r--r--manifests/init.pp2
-rw-r--r--templates/config.py.erb3
2 files changed, 4 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 4ef3e31..42ab317 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -12,7 +12,7 @@ class qwebirc(
$sslfingerprint = false,
$webirc_password = false,
$ident = 'webchat',
- $args = '-n -p 3989',
+ $args = '',
$forwarded_for_header = '',
$forwarded_for_ips = ''
) {
diff --git a/templates/config.py.erb b/templates/config.py.erb
index 9c2bf91..2fb5ad6 100644
--- a/templates/config.py.erb
+++ b/templates/config.py.erb
@@ -205,7 +205,10 @@ FORWARDED_FOR_IPS=<%= forwarded_for_ips %>
# OPTION: ARGS (optional)
# These arguments will be used as if qwebirc was run directly
# with them, see run.py --help for a list of options.
+#ARGS = '-n -p 3989'
+<%- if args != '' -%>
ARGS = "<%= args %>"
+<%- end -%>
# OPTION: SYSLOG_ADDR (optional)
# Used in conjunction with util/syslog.py and -s option.