Jgreen has submitted this change and it was merged.
Change subject: run spamd as user debian-spamd and manage that user+homedir
......................................................................
run spamd as user debian-spamd and manage that user+homedir
Change-Id: I3ec14885022bcaca021208d844b0a2d4e13f251c
---
M modules/spamassassin/manifests/init.pp
1 file changed, 13 insertions(+), 13 deletions(-)
Approvals:
Jgreen: Checked; Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/spamassassin/manifests/init.pp
b/modules/spamassassin/manifests/init.pp
index 143a131..c283e5b 100644
--- a/modules/spamassassin/manifests/init.pp
+++ b/modules/spamassassin/manifests/init.pp
@@ -26,12 +26,12 @@
# Networks for which to trust Received headers from. Defaults to [].
#
# [*spamd_user*]
-# The user to run spamd as. Defaults to "spamd", which is created if
-# non-existent.
+# The user to run spamd as. Defaults to "debian-spamd", which is
+# created if non-existent.
#
# [*spamd_group*]
-# The group to run spamd as. Defaults to "spamd", which is created if
-# non-existent.
+# The group to run spamd as. Defaults to "debian-spamd", which is
+# created if non-existent.
#
# [*custom_scores*]
# Provide custom scores to existing tests. Hash of score => value, defaults
@@ -49,8 +49,8 @@
$bayes_auto_learn = 1,
$short_report_template = false,
$trusted_networks = [],
- $spamd_user = 'spamd',
- $spamd_group = 'spamd',
+ $spamd_user = 'debian-spamd',
+ $spamd_group = 'debian-spamd',
$custom_scores = {},
$debug_logging = '',
) {
@@ -58,18 +58,18 @@
ensure => present,
}
- if ($spamd_user == 'spamd') {
- group { 'spamd':
+ if ($spamd_user == 'debian-spamd') {
+ group { 'debian-spamd':
ensure => present,
}
- user { 'spamd':
+ user { 'debian-spamd':
ensure => present,
- gid => 'spamd',
+ gid => 'debian-spamd',
shell => '/bin/false',
- home => '/nonexistent',
- managehome => false,
+ home => '/var/lib/spamassassin',
+ managehome => true,
system => true,
- require => Group['spamd'],
+ require => Group['debian-spamd'],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/143039
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3ec14885022bcaca021208d844b0a2d4e13f251c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jgreen <jgr...@wikimedia.org>
Gerrit-Reviewer: Jgreen <jgr...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
