From: Luca Filipozzi Date: Thu, 19 Oct 2017 00:59:41 +0000 (+0000) Subject: Merge branch 'master' of ssh://handel.debian.org/~/dsa-puppet X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=62738f7ec0e6961210bee7a2c437f8e7cca8abcc;hp=2778565cdd8430f6d6fc09b63e93f7c5530b7e8a;p=mirror%2Fdsa-puppet.git Merge branch 'master' of ssh://handel.debian.org/~/dsa-puppet --- diff --git a/modules/exim/files/common/callout_users b/modules/exim/files/common/callout_users index 2e834f878..a10dd2689 100644 --- a/modules/exim/files/common/callout_users +++ b/modules/exim/files/common/callout_users @@ -15,6 +15,7 @@ ftpmaster hostmaster iana keyring-maint +leader lintian-maint listarchives mailer-daemon @@ -22,10 +23,12 @@ merchandise mirrors override-change partners +patents planet preinstallvendors press salsa-admin +trademark treasurer wat wbadm diff --git a/modules/exim/files/common/grey_users b/modules/exim/files/common/grey_users index 0f5fb52f0..277214c50 100644 --- a/modules/exim/files/common/grey_users +++ b/modules/exim/files/common/grey_users @@ -49,6 +49,7 @@ mirrors new-maintainer override-change partners +patents planet popcon preinstallvendors @@ -58,6 +59,7 @@ press-it release salsa-admin sshdist +trademark treasurer wat wbadm diff --git a/modules/exim/files/common/rbllist b/modules/exim/files/common/rbllist index 0d511c1c5..4ae9b91e7 100644 --- a/modules/exim/files/common/rbllist +++ b/modules/exim/files/common/rbllist @@ -24,12 +24,14 @@ mirrors : zen.spamhaus.org : dul.dnsbl.sorbs.net : combined.njabl.org new-maintainer : zen.spamhaus.org : dul.dnsbl.sorbs.net : combined.njabl.org override-change : zen.spamhaus.org : dul.dnsbl.sorbs.net : combined.njabl.org partners : zen.spamhaus.org : dul.dnsbl.sorbs.net +patents: zen.spamhaus.org : dul.dnsbl.sorbs.net : combined.njabl.org planet : zen.spamhaus.org : dul.dnsbl.sorbs.net : combined.njabl.org preinstallvendors : zen.spamhaus.org : dul.dnsbl.sorbs.net : bl.spamcop.net press: zen.spamhaus.org : dul.dnsbl.sorbs.net rmurray : sbl-xbl.spamhaus.org salsa-admin : zen.spamhaus.org : dul.dnsbl.sorbs.net : combined.njabl.org security: zen.spamhaus.org : dul.dnsbl.sorbs.net : combined.njabl.org +trademark: zen.spamhaus.org : dul.dnsbl.sorbs.net : combined.njabl.org treasurer : sbl-xbl.spamhaus.org wat : zen.spamhaus.org : dul.dnsbl.sorbs.net : combined.njabl.org wbadm : zen.spamhaus.org : dul.dnsbl.sorbs.net : bl.spamcop.net diff --git a/modules/exim/files/common/rhsbllist b/modules/exim/files/common/rhsbllist index 281dcff3b..69ad75a5a 100644 --- a/modules/exim/files/common/rhsbllist +++ b/modules/exim/files/common/rhsbllist @@ -14,6 +14,7 @@ ftp-master : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant. ftpmaster : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain hostmaster : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain iana : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain +leader : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain keyring-maint : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain mailer-daemon : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain merchandise : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain @@ -21,8 +22,11 @@ mirrors : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org new-maintainer : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain override-change : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain partners : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain +patents : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain preinstallvendors : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain press : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain +treasurer : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain +trademark : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain salsa-admin : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain wat : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain wbadm : bogusmx.rfc-ignorant.org/$sender_address_domain : dsn.rfc-ignorant.org/$sender_address_domain diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers index 272cfd5b6..37d63c42c 100644 --- a/modules/sudo/files/sudoers +++ b/modules/sudo/files/sudoers @@ -105,7 +105,14 @@ nagios storace=(debbackup) NOPASSWD: /usr/lib/nagios/plugins/dsa-check-backuppg %debconfstatic ALL=(debconfstatic) ALL %debdelta ALL=(debdelta) ALL %debian-cd ALL=(debian-cd) ALL -%cloud-builds ALL=(cloud-builds) ALL +%cloud-build ALL=(cloud-build) ALL +%cloud-ci ALL=(cloud-ci) ALL +%cloud-test ALL=(cloud-test) ALL +%cloud-deploy-aws ALL=(cloud-deploy-aws) ALL +%cloud-deploy-azure ALL=(cloud-deploy-azure) ALL +%cloud-deploy-gce ALL=(cloud-deploy-gce) ALL +%cloud-deploy-openstack ALL=(cloud-deploy-openstack) ALL +%cloud-deploy-digitalocean ALL=(cloud-deploy-digitalocean) ALL %debian-i18n ALL=(debian-i18n) ALL %debian-r ALL=(debian-r) ALL %debian-r ALL=(debian-r-wb-buildd) ALL