From a545da76afe1f1cd56385593c187fc1242e06380 Mon Sep 17 00:00:00 2001
From: Maria Haider <mariah@nordu.net>
Date: Fri, 19 Mar 2021 13:40:03 +0100
Subject: [PATCH] =?UTF-8?q?added=20Bj=C3=B6rn=20Mattsson's=20SSH=20key?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../etc/puppet/manifests/cosmos-site.pp        | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index db833009..9bf6f7f3 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -131,7 +131,7 @@ class https_server {
 }
 
 class eidas_log {
-   ensure_resource('file','/etc/logrotate.d',{ 
+   ensure_resource('file','/etc/logrotate.d',{
       ensure => 'directory',
       mode   => '0755'
    })
@@ -225,7 +225,7 @@ class md_signer($dest_host=undef,$dest_dir="",$version="eidas") {
 }
 
 class md_publisher(Array $allow_clients=['any'], $keyname=undef, String $dir="/var/www/html") {
-   $_keyname = $keyname ? { 
+   $_keyname = $keyname ? {
       undef   => $::fqdn,
       default => $keyname
    }
@@ -238,7 +238,7 @@ class md_publisher(Array $allow_clients=['any'], $keyname=undef, String $dir="/v
       ssh_key_type      => safe_hiera('publisher_ssh_key_type')
    } ->
    package {['lighttpd','attr']: ensure => latest } ->
-   exec {'enable-ssl': 
+   exec {'enable-ssl':
       command => "/usr/sbin/lighttpd-enable-mod ssl",
       onlyif  => "test ! -h /etc/lighttpd/conf-enabled/*ssl*"
    } ->
@@ -689,7 +689,7 @@ class metadatamgrs {
 }
 
 class konsulter {
-   ssh_authorized_key {'stefan_santesson': 
+   ssh_authorized_key {'stefan_santesson':
       ensure => present,
       name   => 'stefan@aaa-sec.com',
       type   => 'ssh-rsa',
@@ -870,6 +870,14 @@ class sunetops {
     user    => 'root'
   }
 
+  ssh_authorized_key {'bjorn+8E2DA8EB05F646D7':
+    ensure  => present,
+    name    => 'bjorn+8E2DA8EB05F646D7',
+    type    => 'ssh-rsa',
+    key     => 'AAAAB3NzaC1yc2EAAAADAQABAAACAQDO1nktCA7fWcbmXAlcSEAeAxqlo2bobQblqqhvbjzmDfZdvhUYRXNjc2R4GjAU60yB/qqODE2km1z2xcIojlT/uHIXPx7jkSXvDZQFVDWplGiWKbOZS/apvva2vHBtfDBPSQnDSxr3sINAqehG58gL1coP95uWXodXSfv+BzGqQfYomlqU9f5qjXT2vFA+0XzoGTT9yG2utD3uhYd1k9EN+ED6NCXyCsUoihtEI8M8fF0Sps/QYpdyR34yP98lL+8DwZCtq0eQRMhF6mTcRcTDFdYdgS8jL+lSbw9DaPrWhGll0ie/Xk/v9RC+d3FGE6av0e8YDboNlduwy2iUbA1w1ll/VUOmXy6gudIZ91Edl+sOOyDVfLY3+Dz+RnmoSuCoWyJ00KovBIfgDOUDKe0QMHyVZ9ccMMihTUMUfJ7kYQ9EuidBLsy9GO+ar7FFPHYyVKiWYoxFBafAtIVDM79v9KvQeF2PAfuhSM3yIXeSb+8cp2ANVLX5dncoMPEgdfFRVie5HMwMct+BFwkyIuQ8++kCInGxbM5X1B3uhYTlkYyT3eAR3jHiwZoiBssCPXtmkXjJ0CFB1BcBlGSZktFoBRstGlEb/nEpTH/71JdA60a1eNwbhslNpAWfi3Jco3QPKBoRdwbeIsmDrK1hpJZG9Ke/jZxr3WSv39tu0l4JAw==',
+    user    => 'root'
+  }
+
   # OS hardening
   if $::hostname =~ /kvm/ {
     class {'bastion':
@@ -940,7 +948,7 @@ class nagios_monitor {
   $web_admin_user = 'nagiosadmin';
 
   package { 'xsltproc': ensure => installed}
-   
+
   class { 'webserver': }
   class { 'nagioscfg':
       hostgroups      => $::roles,