From f3b9059f4f08f038b940149f8b85c186a7229868 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Bj=C3=B6rklund?= Date: Thu, 28 Nov 2024 13:58:23 +0100 Subject: [PATCH] Add missing shib config --- global/overlay/etc/puppet/cosmos-rules.yaml | 2 +- .../files/naemon_monitor/attribute-map.xml | 22 +++++ .../files/naemon_monitor/attribute-policy.xml | 82 +++++++++++++++++++ .../soc/files/naemon_monitor/frontend.xml | 12 +++ .../modules/soc/manifests/naemon_monitor.pp | 20 ++++- .../naemon_monitor/docker-compose.yml.erb | 2 + 6 files changed, 135 insertions(+), 5 deletions(-) create mode 100644 global/overlay/etc/puppet/modules/soc/files/naemon_monitor/attribute-map.xml create mode 100644 global/overlay/etc/puppet/modules/soc/files/naemon_monitor/attribute-policy.xml create mode 100644 global/overlay/etc/puppet/modules/soc/files/naemon_monitor/frontend.xml diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml index 5493325..eeb867e 100644 --- a/global/overlay/etc/puppet/cosmos-rules.yaml +++ b/global/overlay/etc/puppet/cosmos-rules.yaml @@ -50,5 +50,5 @@ monitor-dev.cert.sunet.se: domain: monitor-dev.cert.sunet.se thruk_admins: - bjorklund@sunet.se - default_host_group: sunet::nagios:nrpe + default_host_group: sunet::nagios::nrpe nrpe_group: sunet::nagios::nrpe diff --git a/global/overlay/etc/puppet/modules/soc/files/naemon_monitor/attribute-map.xml b/global/overlay/etc/puppet/modules/soc/files/naemon_monitor/attribute-map.xml new file mode 100644 index 0000000..6555029 --- /dev/null +++ b/global/overlay/etc/puppet/modules/soc/files/naemon_monitor/attribute-map.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + diff --git a/global/overlay/etc/puppet/modules/soc/files/naemon_monitor/attribute-policy.xml b/global/overlay/etc/puppet/modules/soc/files/naemon_monitor/attribute-policy.xml new file mode 100644 index 0000000..00b1455 --- /dev/null +++ b/global/overlay/etc/puppet/modules/soc/files/naemon_monitor/attribute-policy.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/global/overlay/etc/puppet/modules/soc/files/naemon_monitor/frontend.xml b/global/overlay/etc/puppet/modules/soc/files/naemon_monitor/frontend.xml new file mode 100644 index 0000000..7c26f81 --- /dev/null +++ b/global/overlay/etc/puppet/modules/soc/files/naemon_monitor/frontend.xml @@ -0,0 +1,12 @@ + +ZqwJCbHnSlUSiKB2w0hoaUuhBQc=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:oasis:names:tc:SAML:2.0:nameid-format:transient diff --git a/global/overlay/etc/puppet/modules/soc/manifests/naemon_monitor.pp b/global/overlay/etc/puppet/modules/soc/manifests/naemon_monitor.pp index 1e9a2d6..76417b3 100644 --- a/global/overlay/etc/puppet/modules/soc/manifests/naemon_monitor.pp +++ b/global/overlay/etc/puppet/modules/soc/manifests/naemon_monitor.pp @@ -100,10 +100,22 @@ class soc::naemon_monitor ( # assume cert is in cosmos repo (overlay) } if $custom_shib { - file { '/opt/naemon_monitor/shibboleth2.xml': - ensure => file, - content => template('soc/naemon_monitor/shibboleth2.xml.erb'), - mode => '0444', + file { + '/opt/naemon_monitor/shibboleth2.xml': + ensure => file, + content => template('soc/naemon_monitor/shibboleth2.xml.erb'), + mode => '0444', + ; + '/opt/naemon_monitor/attribute-map.xml': + ensure => file, + content => file('soc/naemon_monitor/attribute-map.xml'), + mode => '0444', + ; + '/opt/naemon_monitor/attribute-policy.xml': + ensure => file, + content => file('soc/naemon_monitor/attribute-policy.xml'), + mode => '0444', + ; } } diff --git a/global/overlay/etc/puppet/modules/soc/templates/naemon_monitor/docker-compose.yml.erb b/global/overlay/etc/puppet/modules/soc/templates/naemon_monitor/docker-compose.yml.erb index cf33c6c..3013a2f 100644 --- a/global/overlay/etc/puppet/modules/soc/templates/naemon_monitor/docker-compose.yml.erb +++ b/global/overlay/etc/puppet/modules/soc/templates/naemon_monitor/docker-compose.yml.erb @@ -60,6 +60,8 @@ services: - '/opt/naemon_monitor/menu_local.conf:/etc/thruk/menu_local.conf' <%- if @custom_shib -%> - '/opt/naemon_monitor/shibboleth2.xml:/etc/shibboleth/shibboleth2.xml:ro' + - '/opt/naemon_monitor/attribute-map.xml:/etc/shibboleth/attribute-map.xml:ro' + - '/opt/naemon_monitor/attribute-policy.xml:/etc/shibboleth/attribute-policy.xml:ro' <% end -%> <%- @thruk_extra_volumes.each do |extra_volume| -%> - "<%= extra_volume %>"