Revert "Revert "byebye ries""

This reverts commit 92457b979065ae6bd02ddde3f001db2cb7f74b43.

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index dd10e88f56fdf3630a9204f30967d71fb2c472c8..6e98dec2fee8e89b25e21b0fe4a64ee5719d8306 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -145,7 +145,6 @@ host_settings:
     - morricone.debian.org
     - powell.debian.org
     - ravel.debian.org
-    - ries.debian.org
     - spohr.debian.org
     - valente.debian.org
   apache2_security_mirror:
@@ -280,6 +279,7 @@ 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 8518a9df4679302c0d0f921fcf9fafced1de7d6f..581211bb0ed3a2778c1c696608377e2fc675c81a 100644 (file)
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -997,7 +997,6 @@ 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 f25975088355b40b2afefc333b0ad3d7e3f3cec6..d7cfb08b409f8ff2c99da39b351667f95d25f3b7 100644 (file)
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -57,9 +57,6 @@ 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 dac41788c58cd03049bb83910dc5a39c304759c8..559ec9b467a1defef14babb3fb4978df09c1b8c6 100644 (file)
--- 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        = ries, franck
+Host_Alias     FTPHOSTS        = franck
 Host_Alias     ZIVITHOSTS      = zelenka, zandonai
 Host_Alias     AACRAIDHOSTS    = bellini, cimarosa, morricone, paganini, respighi, vivaldi, beethoven, pettersson
 Host_Alias     MEGARAIDHOSTS   = grieg, rautavaara, sibelius