From: Martin Zobel-Helas Date: Thu, 26 Aug 2010 22:55:50 +0000 (+0200) Subject: Revert "byebye ries" X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=92457b979065ae6bd02ddde3f001db2cb7f74b43;p=mirror%2Fdsa-puppet.git Revert "byebye ries" This reverts commit 6218c7c72655ea8a332fc634727efc3188d5502b. --- diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml index 6e98dec2f..dd10e88f5 100644 --- a/modules/debian-org/misc/local.yaml +++ b/modules/debian-org/misc/local.yaml @@ -145,6 +145,7 @@ host_settings: - morricone.debian.org - powell.debian.org - ravel.debian.org + - ries.debian.org - spohr.debian.org - valente.debian.org apache2_security_mirror: @@ -279,7 +280,6 @@ host_settings: rautavaara.debian.org: mailout.debian.org rem.debian.org: mailout.debian.org respighi.debian.org: mailout.debian.org - ries.debian.org: mailout.debian.org rietz.debian.org: mailout.debian.org rore.debian.org: mailout.debian.org rossini.debian.org: mailout.debian.org diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb index 581211bb0..8518a9df4 100644 --- a/modules/exim/templates/eximconf.erb +++ b/modules/exim/templates/eximconf.erb @@ -997,6 +997,7 @@ check_message: begin rewrite +\N^buildd_(.*)@ries\.debian\.org$\N buildd_$1@buildd.debian.org T \N^buildd_(.*)@franck\.debian\.org$\N buildd_$1@buildd.debian.org T \N^buildd_(.*)@klecker\.debian\.org$\N buildd_$1@buildd.debian.org T *@debian.org ${lookup{$1}cdb{/var/lib/misc/${primary_hostname}/mail-forward.cdb}{$value}fail} T diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb index d7cfb08b4..f25975088 100644 --- a/modules/exim/templates/virtualdomains.erb +++ b/modules/exim/templates/virtualdomains.erb @@ -57,6 +57,9 @@ nm.debian.org: user=nm group=nm directory=/org/nm.debian.org/mail/" when "ravel.debian.org" then "women.debian.org: user=nobody group=mujeres directory=/org/women.debian.org/mail" + when "ries.debian.org" then "release.debian.org: user=release group=debian-release directory=/org/release.debian.org/mail +ftp-master.debian.org: user=dak group=debadmin directory=/srv/ftp.debian.org/mail group_writable=true" + when "spohr.debian.org" then "rt.debian.org: user=rt group=rt directory=/srv/rt.debian.org/mail admin.debian.org: user=mail_admin group=mail_admin directory=/org/admin.debian.org/mail/" diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers index 559ec9b46..dac41788c 100644 --- a/modules/sudo/files/common/sudoers +++ b/modules/sudo/files/common/sudoers @@ -24,7 +24,7 @@ Defaults passprompt="[sudo] password for %u on %h: " Host_Alias QAHOSTS = master, merkel Host_Alias WEBHOSTS = klecker, wolkenstein Host_Alias SECHOSTS = klecker, chopin -Host_Alias FTPHOSTS = franck +Host_Alias FTPHOSTS = ries, franck Host_Alias ZIVITHOSTS = zelenka, zandonai Host_Alias AACRAIDHOSTS = bellini, cimarosa, morricone, paganini, respighi, vivaldi, beethoven, pettersson Host_Alias MEGARAIDHOSTS = grieg, rautavaara, sibelius