Jgreen has submitted this change and it was merged. Change subject: more spamassassin config variables in template ......................................................................
more spamassassin config variables in template Change-Id: Iaceae15c87eb2d90113ef73ba1c2ed1233a7ca21 --- M manifests/mail.pp M templates/spamassassin/spamassassin.default.erb 2 files changed, 4 insertions(+), 2 deletions(-) Approvals: Jgreen: Checked; Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/mail.pp b/manifests/mail.pp index a615c34..6ef78dc 100644 --- a/manifests/mail.pp +++ b/manifests/mail.pp @@ -255,6 +255,8 @@ # SpamAssassin http://spamassassin.apache.org/ class spamassassin( $required_score = '5.0', + $max_children = 8, + $nicelevel = 10, $use_bayes = 1, $bayes_auto_learn = 1, $short_report_template = 'false', diff --git a/templates/spamassassin/spamassassin.default.erb b/templates/spamassassin/spamassassin.default.erb index 28c54eb..f16a169 100644 --- a/templates/spamassassin/spamassassin.default.erb +++ b/templates/spamassassin/spamassassin.default.erb @@ -14,7 +14,7 @@ # make sure --max-children is not set to anything higher than 5, # unless you know what you're doing. -OPTIONS="--max-children 8 --nouser-config --listen-ip=127.0.0.1 -u spamd -g spamd" +OPTIONS="--max-children <%= max_children %> --nouser-config --listen-ip=127.0.0.1 -u <%= spamd_user %> -g <%= spamd_group %>" # Pid file # Where should spamd write its PID to file? If you use the -u or @@ -23,7 +23,7 @@ PIDFILE="/var/run/spamd.pid" # Set nice level of spamd -NICE="--nicelevel 10" +NICE="--nicelevel <%= nicelevel %>" # Cronjob # Set to anything but 0 to enable the cron job to automatically update -- To view, visit https://gerrit.wikimedia.org/r/81525 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaceae15c87eb2d90113ef73ba1c2ed1233a7ca21 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Jgreen <[email protected]> Gerrit-Reviewer: Jgreen <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
