From 3a8a2ef7517face9cff891c242e90b2cba916b57 Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Sun, 17 Mar 2019 13:36:15 +0100 Subject: [PATCH] Decommission lully.d.o Replaced by loghost-osuosl-01 --- modules/debian_org/files/misc/local.yaml | 1 - modules/ferm/manifests/per_host.pp | 2 +- modules/syslog_ng/manifests/init.pp | 2 +- modules/syslog_ng/templates/syslog-ng.conf.erb | 17 ++--------------- 4 files changed, 4 insertions(+), 18 deletions(-) diff --git a/modules/debian_org/files/misc/local.yaml b/modules/debian_org/files/misc/local.yaml index 67036cb47..ddcc7f377 100644 --- a/modules/debian_org/files/misc/local.yaml +++ b/modules/debian_org/files/misc/local.yaml @@ -46,7 +46,6 @@ nameinfo: klecker.debian.org: Dedicated to Joel 'Espy' Klecker (1979 - July 11th, 2000) lindsay.debian.org: Maria Lindsay Bliss (May 15th, 1827 - April 3rd, 1898) lotti.debian.org: Antonio Lotti (ca. 1667 - January 5th, 1740) - lully.debian.org: Jean-Baptiste de Lully (November 28th, 1632 - March 22nd, 1687) mailly.debian.org: Alphonse Jean Ernest Mailly (November 27th, 1833 - January 10th, 1918) melartin.debian.org: Erkki Melartin (February 7th, 1875 - February 14th, 1937) menotti.debian.org: Gian Carlo Menotti (July 7th, 1911 - February 1st, 2007) diff --git a/modules/ferm/manifests/per_host.pp b/modules/ferm/manifests/per_host.pp index d48793620..2d6811e4a 100644 --- a/modules/ferm/manifests/per_host.pp +++ b/modules/ferm/manifests/per_host.pp @@ -14,7 +14,7 @@ class ferm::per_host { rule => '&SERVICE_RANGE(tcp, 3493, ( 82.195.75.64/26 192.168.43.0/24 ))' } } - lotti,lully,loghost-grnet-01,loghost-osuosl-01: { + lotti,loghost-grnet-01,loghost-osuosl-01: { @ferm::rule { 'dsa-syslog': description => 'Allow syslog access', rule => '&SERVICE_RANGE(tcp, 5140, $HOST_DEBIAN_V4)' diff --git a/modules/syslog_ng/manifests/init.pp b/modules/syslog_ng/manifests/init.pp index c6d205261..e7a20b630 100644 --- a/modules/syslog_ng/manifests/init.pp +++ b/modules/syslog_ng/manifests/init.pp @@ -23,7 +23,7 @@ class syslog_ng { source => 'puppet:///modules/syslog_ng/syslog-ng.logrotate', require => Package['syslog-ng'] } - if $::hostname in [lotti,lully,loghost-grnet-01,loghost-osuosl-01] { + if $::hostname in [lotti,loghost-grnet-01,loghost-osuosl-01] { file { '/etc/logrotate.d/syslog-ng-loggers': source => 'puppet:///modules/syslog_ng/syslog-ng.logrotate.loggers', require => Package['syslog-ng'] diff --git a/modules/syslog_ng/templates/syslog-ng.conf.erb b/modules/syslog_ng/templates/syslog-ng.conf.erb index 614ef81a9..a0016ef16 100644 --- a/modules/syslog_ng/templates/syslog-ng.conf.erb +++ b/modules/syslog_ng/templates/syslog-ng.conf.erb @@ -124,7 +124,7 @@ source s_local { <%- end -%> }; -<%- if (@hostname == "lotti") || (@hostname == "lully") || (@hostname == "loghost-grnet-01") || (@hostname == "loghost-osuosl-01") -%> +<%- if (@hostname == "lotti") || (@hostname == "loghost-grnet-01") || (@hostname == "loghost-osuosl-01") -%> source s_network { tcp6(port(5140) max-connections(400) tls( key_file("/etc/exim4/ssl/thishost.key") @@ -418,16 +418,6 @@ destination loghost-lotti { ca_dir("/etc/ssl/debian/certs/") ) ); -}; - <%- end -%> - <%- if @hostname != "lully" -%> -destination loghost-lully { - tcp("lully.debian.org" port (5140) - tls( key_file("/etc/ssl/private/thishost.key") - cert_file("/etc/ssl/debian/certs/thishost.crt") - ca_dir("/etc/ssl/debian/certs/") - ) - ); }; <%- end -%> <%- if @hostname != "loghost-grnet-01" -%> @@ -456,9 +446,6 @@ log { <%- if @hostname != "lotti" -%> destination(loghost-lotti); <%- end -%> - <%- if @hostname != "lully" -%> - destination(loghost-lully); - <%- end -%> <%- if @hostname != "loghost-grnet-01" -%> destination(loghost-loghost-grnet-01); <%- end -%> @@ -469,7 +456,7 @@ log { -<%- if (@hostname == "lotti") || (@hostname == "lully") || (@hostname == "loghost-grnet-01") || (@hostname == "loghost-osuosl-01") -%> +<%- if (@hostname == "lotti") || (@hostname == "loghost-grnet-01") || (@hostname == "loghost-osuosl-01") -%> ############################################################################### ########## ON LOG HOST ######################################################## ############################################################################### -- 2.20.1