From 8c54c329a260972d770be7087bfeb235b978cbf4 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Mon, 28 Jan 2019 22:43:43 +0100 Subject: [PATCH] add loghost-osuosl-01 --- modules/ferm/manifests/per_host.pp | 2 +- modules/syslog_ng/manifests/init.pp | 2 +- modules/syslog_ng/templates/syslog-ng.conf.erb | 17 +++++++++++++++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/modules/ferm/manifests/per_host.pp b/modules/ferm/manifests/per_host.pp index 19086823b..d48793620 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: { + lotti,lully,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 b12219d24..ead0954d5 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 [lotty,lully,loghost-grnet-01] { + if $::hostname in [lotty,lully,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 031e6068c..d2940e1c0 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") -%> +<%- if (@hostname == "lotti") || (@hostname == "lully") || (@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") @@ -440,6 +440,16 @@ destination loghost-loghost-grnet-01 { ca_dir("/etc/ssl/debian/certs/") ) ); +}; + <%- end -%> + <%- if @hostname != "loghost-osuosl-01" -%> +destination loghost-loghost-osuosl-01 { + tcp("loghost-osuosl-01.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 -%> @@ -454,11 +464,14 @@ log { <%- if @hostname != "loghost-grnet-01" -%> destination(loghost-loghost-grnet-01); <%- end -%> + <%- if @hostname != "loghost-osuosl-01" -%> + destination(loghost-loghost-osuosl-01); + <%- end -%> }; -<%- if (@hostname == "lotti") || (@hostname == "lully") || (@hostname == "loghost-grnet-01") -%> +<%- if (@hostname == "lotti") || (@hostname == "lully") || (@hostname == "loghost-grnet-01") || (@hostname == "loghost-osuosl-01") -%> ############################################################################### ########## ON LOG HOST ######################################################## ############################################################################### -- 2.20.1