From 797e5f559261b62e391b9123083696aeda9155fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Bj=C3=B6rklund?= Date: Fri, 21 Feb 2025 11:02:24 +0100 Subject: [PATCH] Split rsyslog to server and to come: client. --- global/overlay/etc/puppet/cosmos-rules.yaml | 4 +--- .../modules/soc/manifests/{rsyslog.pp => rsyslog/server.pp} | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) rename global/overlay/etc/puppet/modules/soc/manifests/{rsyslog.pp => rsyslog/server.pp} (99%) diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml index 04d1f1e..d41411e 100644 --- a/global/overlay/etc/puppet/cosmos-rules.yaml +++ b/global/overlay/etc/puppet/cosmos-rules.yaml @@ -93,8 +93,6 @@ zammad-test.cert.sunet.se: passthrough: ['/api', '/oauth'] internal-sto3-test-rsyslog-1.cert.sunet.se: - soc::rsyslog: + soc::rsyslog::server: syslog_enable_remote: false - udp_port: 514 - tcp_port: 514 relp_port: 2514 diff --git a/global/overlay/etc/puppet/modules/soc/manifests/rsyslog.pp b/global/overlay/etc/puppet/modules/soc/manifests/rsyslog/server.pp similarity index 99% rename from global/overlay/etc/puppet/modules/soc/manifests/rsyslog.pp rename to global/overlay/etc/puppet/modules/soc/manifests/rsyslog/server.pp index a9c86a1..b019589 100644 --- a/global/overlay/etc/puppet/modules/soc/manifests/rsyslog.pp +++ b/global/overlay/etc/puppet/modules/soc/manifests/rsyslog/server.pp @@ -1,5 +1,5 @@ # rsyslog -class soc::rsyslog( +class soc::rsyslog::server( $daily_rotation = true, $syslog_servers = lookup(syslog_servers, undef, undef, []), $relp_syslog_servers = lookup(relp_syslog_servers, undef, undef, []),