Decommission merikanto host

Signed-off-by: Héctor Orón Martínez <zumbi@debian.org>

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 42eb9ec18c759cc901cf26d71825417568e502b4..ddab39c4a56e01f2fd8718789ac0df56bb240da8 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -77,7 +77,6 @@ nameinfo:
   mayer.debian.org: John Mayer (October 28th, 1930 - March 9th, 2004)
   mayr.debian.org: Johann(es) Simon Mayr (June 14th, 1763 - December 2nd, 1845)
   menotti.debian.org: Gian Carlo Menotti (July 7th, 1911 - February 1st,, 2007)
-  merikanto.debian.org: Oskar Merikanto (August 5th, 1868 - February 17th, 1924)
   merulo.debian.org: Claudio Merulo (April 8th, 1533 - May 4th, 1604)
   milanollo.debian.org: Teresa Milanollo (August 28th, 1827 - October 25th, 1904)
   muffat.debian.org: George Muffat (June 1st, 1653 - February 23rd, 1704)
@@ -223,7 +222,6 @@ host_settings:
     - stabile.debian.org
     # decommissioning
     - cilea.debian.org
-    - merikanto.debian.org
     - paganini.debian.org
     - rautavaara.debian.org
     - respighi.debian.org

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index 42a8aa19784f63aee0c612ea759a6eefc8b54975..319c792d77395daade8bb46d50bc91ef4a7a8a25 100644 (file)
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -3,7 +3,7 @@ class ferm::per-host {
                include ferm::zivit
        }
 
-       if $::hostname in [glinka,klecker,merikanto,ravel,rietz,senfl,sibelius,stabile] {
+       if $::hostname in [glinka,klecker,ravel,rietz,senfl,sibelius,stabile] {
                ferm::rule { 'dsa-rsync':
                        domain      => '(ip ip6)',
                        description => 'Allow rsync access',

diff --git a/modules/ntp/manifests/client.pp b/modules/ntp/manifests/client.pp
index d7eb61876fec0e91533dbca735afd2a871766125..0a0c14ce186f31bc19e66b62882ace9ee8b22c31 100644 (file)
--- a/modules/ntp/manifests/client.pp
+++ b/modules/ntp/manifests/client.pp
@@ -22,10 +22,6 @@ class ntp::client {
        file { '/etc/ntp.keys.d/ntpkey_iff_luchesi':
                source => 'puppet:///modules/ntp/ntpkey_iff_luchesi.pub',
        }
-
-       file { '/etc/ntp.keys.d/ntpkey_iff_merikanto':
-               ensure => absent,
-       }
        file { '/etc/ntp.keys.d/ntpkey_iff_orff':
                ensure => absent,
        }