Align exim module parameter name with the tree
The rest of the tree, literally everwhere, calls this value sysadmins - but the exim module calls it sysadmin. This doesn't really matter of course, but I noticed it while looking in to a review on another patch and couldn't not fix it. Also, there are two comments that are clearly remnants from having used exim.pp as a starting point. Change-Id: I184701c8c4d4b1e9d93d746b2ad0c5fc53443866
This commit is contained in:
parent
47183deb2e
commit
615e0cfb39
@ -4,7 +4,7 @@ class exim(
|
|||||||
$queue_run_max = '5',
|
$queue_run_max = '5',
|
||||||
$queue_smtp_domains = '',
|
$queue_smtp_domains = '',
|
||||||
$smarthost = false,
|
$smarthost = false,
|
||||||
$sysadmin = []
|
$sysadmins = []
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include exim::params
|
include exim::params
|
||||||
|
@ -14,6 +14,6 @@ security: root
|
|||||||
|
|
||||||
gerrit2: root
|
gerrit2: root
|
||||||
jenkins: root
|
jenkins: root
|
||||||
<% if sysadmin.length > 0 -%>
|
<% if sysadmins.length > 0 -%>
|
||||||
root: <%= sysadmin.join(",") %>
|
root: <%= sysadmins.join(",") %>
|
||||||
<% end -%>
|
<% end -%>
|
||||||
|
@ -1,6 +1,4 @@
|
|||||||
# Class to configure cacti on a node.
|
# Class to configure cacti on a node.
|
||||||
# Takes a list of sysadmin email addresses as a parameter. Exim will be
|
|
||||||
# configured to email cron spam and other alerts to this list of admins.
|
|
||||||
class openstack_project::cacti (
|
class openstack_project::cacti (
|
||||||
$sysadmins = []
|
$sysadmins = []
|
||||||
) {
|
) {
|
||||||
|
@ -1,6 +1,4 @@
|
|||||||
# Class to configure graphite on a node.
|
# Class to configure graphite on a node.
|
||||||
# Takes a list of sysadmin email addresses as a parameter. Exim will be
|
|
||||||
# configured to email cron spam and other alerts to this list of admins.
|
|
||||||
class openstack_project::graphite (
|
class openstack_project::graphite (
|
||||||
$sysadmins = [],
|
$sysadmins = [],
|
||||||
$graphite_admin_user = '',
|
$graphite_admin_user = '',
|
||||||
|
@ -14,7 +14,7 @@ class openstack_project::lists(
|
|||||||
$listdomain = 'lists.openstack.org'
|
$listdomain = 'lists.openstack.org'
|
||||||
|
|
||||||
class { 'exim':
|
class { 'exim':
|
||||||
sysadmin => $listadmins,
|
sysadmins => $listadmins,
|
||||||
queue_interval => '1m',
|
queue_interval => '1m',
|
||||||
queue_run_max => '50',
|
queue_run_max => '50',
|
||||||
mailman_domains => [$listdomain],
|
mailman_domains => [$listdomain],
|
||||||
|
@ -17,6 +17,6 @@ class openstack_project::server (
|
|||||||
certname => $certname,
|
certname => $certname,
|
||||||
}
|
}
|
||||||
class { 'exim':
|
class { 'exim':
|
||||||
sysadmin => $sysadmins,
|
sysadmins => $sysadmins,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user