From 9c8b8a5a3c15226b92dc27bb37ee69e84dbd8eef Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Tue, 16 May 2023 16:16:22 +0200 Subject: [PATCH] upgraded docker-ce nagios config change made Paul Scott's SSH key absent Ref - SC-1577 --- global/overlay/etc/puppet/cosmos-rules.yaml | 4 ++-- global/overlay/etc/puppet/manifests/cosmos-site.pp | 4 ++-- .../etc/puppet/modules/eid/manifests/nagios_monitor.pp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml index 33c097cb..8061c217 100644 --- a/global/overlay/etc/puppet/cosmos-rules.yaml +++ b/global/overlay/etc/puppet/cosmos-rules.yaml @@ -1038,7 +1038,7 @@ log-1.sveidas.se: sunet_iaas_cloud: autoupdate: eid::dockerhost: - version: '5:20.10.7~3-0~ubuntu-bionic' + version: '5:23.0.6-1~ubuntu.20.04~focal' eidas_connector: version: 1.7.0_hsm2_ubuntu hostname: qa.connector.eidas.swedenconnect.se @@ -1053,7 +1053,7 @@ log-1.sveidas.se: '^eidas-connector-[0-9]+\.test\.sveidas\.se$': sunet_iaas_cloud: eid::dockerhost: - version: '5:20.10.6~3-0~ubuntu-focal' + version: '5:23.0.6-1~ubuntu.20.04~focal' konsulter: autoupdate: eidas_connector: diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 25ce7adc..7e87bcb1 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -785,14 +785,14 @@ class metadatamgrs { user => 'root' } ssh_authorized_key {'paul_scott': - ensure => present, + ensure => absent, name => 'paul.scott@kau.se', type => 'ssh-rsa', key => 'AAAAB3NzaC1yc2EAAAADAQABAAACAQD3zTpDifYHWlsg3sIAOFKbseiHl/8CllfJS1KwqzDt3jZlIUgCN9KhEyQxldFI2qKRubltLK6b/L8oN4yMrBsXxrfLZThP4RDhhy+IVCnTt489Kg2E2lHqp0DC8pZrtIwS1E50G+Y1p0nS/MYpcxKX/SthDr5cRvNBZXm3C8Pii3BmFPWKy5nLcqQDsK3JeL1D6ss73Tn5XhUWjJTqo2OsU6XuYWyGpbjjMwf+T15ubJJOXztJLN9HLb9QdmZQxM2kKU6JIo2DW01lcGGmsSVdFLbmDfx9y9csNgn/C0QVyo6t9IV8jbbW4Qo6QsrL04ngHhxXkBv2HO5aWZvVTR5mZAuyXKOumbKSqGcU1nXNzNErO0bcK4jlQOtDvACEOUV5BJEAgcq0s943EGSgvPUaOKlp1PZauHBMQVAhWnguEUmytiVPbPN+kGy8H0zqoQaHtzdqNAw1F9pvy5AGwrCquWfNgqKP1heTMSUgbxJh5xET/QrgiFUpGpS7wOUvrp2TP//vkiLdy7wriwF1INxRN/rTrr4p3KMFoNkLGrSZc9EYv1J2o/csbO8LIs0oOKqZw98LOLi4qsWBOYAx9hSHBiej+Jj0mRIyGDt9GHPCscJ0yBJMaGy3+o3luIGfIiQpQkQqoiSz5fVIsh3IYd1RiSkO1Hm73PCEjbbhXGWJFQ==', user => 'root' } ssh_authorized_key {'paul_scott-y5': - ensure => present, + ensure => absent, name => 'paul.scott@kau.se-yubikey5', type => 'ssh-rsa', key => 'AAAAB3NzaC1yc2EAAAADAQABAAACAQDwAmCtqutG+WF2eqqYn+eXwLi1VoNm8TgR/IyNwgf5CP4Pi0K2XxZu2ntFUtOM4Ht5Sf/rD8Y6tFypNYzupMpCqvmub4VA8joGivChc44JuNHylYNvLdaRK3AKdL4Qpr+F6r3YCNGO4xHYbZOG9/JKFcBpFot3ggq96LIp+DpBHXYwQJ3wSjHDPX5xlTjAmgQ0dsBRQoEWIb1EZ7omBMk+e6B7nv9FfQ+kU7qk8p0qMInwUuaFj6P8OAKHQXC1ZmMBX2BKClxjR5wnOtmCTRz6ACDweyC5GK0RyCC0/jGhPkWnodskiCeOXpcnJF8a0gCvrfFdfg9oFHaKZwgjRKeyEWIOnhbiKdEDrnEvSX5OlRuKfaqhOYgsmRFwmOtPH3PKbymybs2KkesiZDJr1KCWwSXd/Bz7EivRX0nLDHEAMi+EASqUc99RtMWc31rYVHDmtPhXVGpqmLYIwODyC87dxKR+vBx6hbTdlIXLntKbipmSct/Y3EvdSpcNw5AFYPvPexfeF+C3ocIGtNgWsawadkMF+MDVSbU443VLvRprARaDfInyswKjqHWVuosXzWYS2rUAFX3NAnw7jAtvjfCswebiXTQwanQz6UhPl5w8tyze0LqTbiRTf+rKDwc1F6h+mv6zvHODYu2Kj+YnkEGO9vVEjPB+o1Jw2oLkawXlcQ==', diff --git a/global/overlay/etc/puppet/modules/eid/manifests/nagios_monitor.pp b/global/overlay/etc/puppet/modules/eid/manifests/nagios_monitor.pp index c88f3eb8..43b10aa8 100644 --- a/global/overlay/etc/puppet/modules/eid/manifests/nagios_monitor.pp +++ b/global/overlay/etc/puppet/modules/eid/manifests/nagios_monitor.pp @@ -22,7 +22,7 @@ class eid::nagios_monitor { ensure_resource('package','nagios-nrpe-plugin', { ensure => present }) #class {'nagioscfg::slack': domain => 'sunet.slack.com', token => safe_hiera('slack_token','') } -> - class {'nagioscfg::passive': enable_notifications => '1', obsess_over_services => '0', obsess_over_hosts => '0', nagios_config_file => '/etc/nagios4/nagios.cfg'} + class {'nagioscfg::passive': enable_notifications => '0', obsess_over_services => '0', obsess_over_hosts => '0', nagios_config_file => '/etc/nagios4/nagios.cfg'} package {'apache2': ensure => 'latest'}