From: Héctor Orón Martínez Date: Fri, 18 Sep 2015 19:02:43 +0000 (+0200) Subject: eysler.d.o: decomission X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=6f21d063c05bad35478d51ec1b4bc46bb2eb0d17;ds=sidebyside eysler.d.o: decomission Signed-off-by: Héctor Orón Martínez --- diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp index aa90ad03..6785f23d 100644 --- a/modules/debian-org/manifests/init.pp +++ b/modules/debian-org/manifests/init.pp @@ -162,7 +162,7 @@ class debian-org { components => ['main','contrib','non-free'] } - #if ($::hostname in [corelli, eysler, lucatelli, mayr, pettersson]) or + #if ($::hostname in [corelli, lucatelli, mayr, pettersson]) or # ($::hoster and ($::hoster in [bytemark, man-da, brown])) { # site::aptrepo { 'proposed-updates': # url => $mirror, diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml index e534fb9f..fa7b6ad6 100644 --- a/modules/debian-org/misc/local.yaml +++ b/modules/debian-org/misc/local.yaml @@ -33,7 +33,6 @@ nameinfo: eberlin.debian.org: Johann Ernst Eberlin (March 1702 27th - June 19th, 1762) eder.debian.org: Helmut Eder (December 26th, 1916 - February 8th, 2005) elgar.debian.org: Edward Elgar (1857 - 1934) - eysler.debian.org: Edmund Samuel Eysler (March 12th, 1874 - October 4th, 1949) falla.debian.org: Manuel de Falla y Matheu (November 23rd, 1876 - November 14th, 1946) fano.debian.org: Guido Alberto Fano (March 18th, 1875 - August 14th, 1961) fayrfax.debian.org: Robert Fayrfax (April 23rd, 1464 - October 24th, 1521) @@ -225,7 +224,6 @@ host_settings: - caballero.debian.org - corelli.debian.org - eberlin.debian.org - - eysler.debian.org - fano.debian.org - fayrfax.debian.org - fils.debian.org diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp index ca13174a..186376cb 100644 --- a/modules/ferm/manifests/per-host.pp +++ b/modules/ferm/manifests/per-host.pp @@ -477,7 +477,7 @@ class ferm::per-host { } # vpn fu case $::hostname { - draghi,eysler: { + draghi: { @ferm::rule { 'dsa-vpn': description => 'Allow openvpn access', rule => '&SERVICE(udp, 17257)'