From dcc47fbed7794921a5bdf89f366d6434a8ecb329 Mon Sep 17 00:00:00 2001 From: =?utf8?q?H=C3=A9ctor=20Or=C3=B3n=20Mart=C3=ADnez?= Date: Tue, 30 Sep 2014 12:27:42 +0200 Subject: [PATCH] ancina: decommision rt#5316 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Héctor Orón Martínez --- modules/debian-org/misc/local.yaml | 4 ---- modules/ferm/manifests/per-host.pp | 2 +- modules/ntp/templates/ntp.conf | 2 -- modules/ntpdate/manifests/init.pp | 1 - 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml index ce34ed2f..8375bdd6 100644 --- a/modules/debian-org/misc/local.yaml +++ b/modules/debian-org/misc/local.yaml @@ -2,7 +2,6 @@ nameinfo: abel.debian.org: Carl Friedrich Abel (1723 - 1787) adayevskaya.debian.org: Ella Georgiyevna Adayevskaya (February, 22nd 1846 [O.S. February 10th] - July 26th, 1926) - ancina.debian.org: Giovanni Giovenale Ancina (October 19th, 1545 - August 30th, 1604) antheil.debian.org: George Antheil (1900 - 1959) arcadelt.debian.org: Jacques Arcadelt (also Jacob Arcadelt) (?1507 - October 14th, 1568) arnold.debian.org: Malcolm Henry Arnold (1921 - 2006) @@ -211,7 +210,6 @@ host_settings: - zelenka.debian.org # buildd - alkman.debian.org - - ancina.debian.org - antheil.debian.org - arcadelt.debian.org - arm-arm-01.debian.org @@ -260,7 +258,6 @@ host_settings: - x86-bm-01.debian.org broken-rtc: - abel.debian.org - - ancina.debian.org - antheil.debian.org - arm-arm-01.debian.org - arm-arm-02.debian.org @@ -278,7 +275,6 @@ host_settings: - rem.debian.org - sompek.debian.org mail_port: - ancina.debian.org: 2025 klecker.debian.org: 2025 zani.debian.org: 587 no_munin: diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp index 39514bb7..b7312c5c 100644 --- a/modules/ferm/manifests/per-host.pp +++ b/modules/ferm/manifests/per-host.pp @@ -1,5 +1,5 @@ class ferm::per-host { - if $::hostname in [ancina,zandonai,zelenka] { + if $::hostname in [zandonai,zelenka] { include ferm::zivit } diff --git a/modules/ntp/templates/ntp.conf b/modules/ntp/templates/ntp.conf index 4885e571..9e688047 100644 --- a/modules/ntp/templates/ntp.conf +++ b/modules/ntp/templates/ntp.conf @@ -22,8 +22,6 @@ server 2.debian.pool.ntp.org iburst dynamic server 3.debian.pool.ntp.org iburst dynamic leapfile /var/lib/ntp/leap-seconds.list -<% elsif fqdn == "ancina.debian.org" -%> -server ntp.ugent.be iburst dynamic <% elsif scope.lookupvar('site::nodeinfo')['misc']['natted'] -%> # autokey doesn't work behind nat diff --git a/modules/ntpdate/manifests/init.pp b/modules/ntpdate/manifests/init.pp index 56b4b02b..c514aafd 100644 --- a/modules/ntpdate/manifests/init.pp +++ b/modules/ntpdate/manifests/init.pp @@ -9,7 +9,6 @@ class ntpdate { } $ntpservers = $::hostname ? { - ancina => 'ntp.ugent.be', default => ['czerny.debian.org', 'clementi.debian.org', 'bm-bl1.debian.org', 'bm-bl2.debian.org', 'dijkstra.debian.org', 'luchesi.debian.org'] } -- 2.39.2