From c9e5c71b1595b2d28c93e169554d2218ff34e699 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sat, 27 Mar 2010 16:33:41 +0000 Subject: [PATCH] s/cimarosa/grieg/ everywhere that matters, with luck Signed-off-by: Stephen Gran --- modules/apache2/templates/ressource-limits.erb | 2 +- modules/debian-org/misc/local.yaml | 2 +- modules/exim/templates/virtualdomains.erb | 2 +- modules/portforwarder/misc/config.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/apache2/templates/ressource-limits.erb b/modules/apache2/templates/ressource-limits.erb index 8ddb67362..f076a72b3 100644 --- a/modules/apache2/templates/ressource-limits.erb +++ b/modules/apache2/templates/ressource-limits.erb @@ -7,7 +7,7 @@ RLimitCPU 180 <%= case fqdn when "merkel.debian.org" then "" # maybe unlimited will be better - when "cimarosa.debian.org" then + when "grieg.debian.org" then # buildd.debian.org "RLimitMEM "+(96 * 1024**2).to_s else diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml index f20648de3..547081251 100644 --- a/modules/debian-org/misc/local.yaml +++ b/modules/debian-org/misc/local.yaml @@ -130,7 +130,6 @@ host_settings: - busoni.debian.org - byrd.debian.org - chopin.debian.org - - cimarosa.debian.org - draghi.debian.org - grieg.debian.org - klecker.debian.org @@ -210,6 +209,7 @@ host_settings: caballero.debian.org: mailout.debian.org carver.debian.org: mailout.debian.org cilea.debian.org: mailout.debian.org + cimarosa.debian.org: mailout.debian.org crest.debian.org: mailout.debian.org corelli.debian.org: mailout.debian.org dijkstra.debian.org: mailout.debian.org diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb index 36b73e565..454eff380 100644 --- a/modules/exim/templates/virtualdomains.erb +++ b/modules/exim/templates/virtualdomains.erb @@ -25,7 +25,7 @@ vdoms = case fqdn when "chopin.debian.org" then "security.debian.org: user=mail_security group=nogroup directory=/srv/security-master.debian.org/mail/" - when "cimarosa.debian.org", "grieg.debian.org" then "buildd.debian.org: user=wbadm group=wbadm directory=/srv/buildd.debian.org/mail" + when "grieg.debian.org" then "buildd.debian.org: user=wbadm group=wbadm directory=/srv/buildd.debian.org/mail" #logs.buildd.debian.org: user=wbadm group=wbadm directory=/srv/logs.buildd.debian.org/mail" when "draghi.debian.org" then "db.debian.org: user=mail_db group=nogroup directory=/srv/db.debian.org/mail" diff --git a/modules/portforwarder/misc/config.yaml b/modules/portforwarder/misc/config.yaml index 92fc76ee7..5e5457a87 100644 --- a/modules/portforwarder/misc/config.yaml +++ b/modules/portforwarder/misc/config.yaml @@ -17,6 +17,6 @@ merkel.debian.org: samosa.debian.org: - source_bind_port: 5433 - target_host: cimarosa.debian.org + target_host: grieg.debian.org target_port: 5433 -- 2.20.1