3 files changed, 57 insertions, 49 deletions
diff --git a/global/overlay/etc/cosmos/keys/john-D9654A60.pub b/global/overlay/etc/cosmos/keys/john-D9654A60.pub
deleted file mode 100644
index a1a15a3..0000000
--- a/global/overlay/etc/cosmos/keys/john-D9654A60.pub
+++ /dev/null
@@ -1,49 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1
-
-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
-g9VZQNI=
-=7NYp
------END PGP PUBLIC KEY BLOCK-----
diff --git a/global/overlay/etc/cosmos/keys/john-DEF87F3F.pub b/global/overlay/etc/cosmos/keys/john-DEF87F3F.pub
new file mode 100644
index 0000000..e5d4279
--- /dev/null
+++ b/global/overlay/etc/cosmos/keys/john-DEF87F3F.pub
@@ -0,0 +1,49 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+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
+oFoL
+=U7+y
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 73b5b75..f568a6c 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -646,6 +646,14 @@ class sunetops {
      user   => 'root'
   }
 
+  ssh_authorized_key {'john+DEF87F3F':
+    ensure  => present,
+    name    => 'john+DEF87F3F@nordu.net',
+    key     => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQDG8iFmY/p/20Pnu1pwAKl56Xy05gTs8krUJx6npdB+jqBMNw4jRFOiInHoQwUqxr3ZhKj4RILgc7z3XVRFEqDCqj4j7AWidBnpBEtARECU8LPrb+UZVYa5+uuHzY+FKLT4P5Aa5NOYPLrX4c7etiHFQDman+AP98s/FCwgp+CsuXAUOz5+ZmjlUyD4BxNI9neqK4VqtqTMiBzhCkZaFJs+2lkYbXIwOU/6eVJ6O4iuKyglMjiT91ok05TvUkYgIIq6jJHFDnfkPFYutwTDKg8sDsChJ1Gb5C+wYHug5yc3NplYQ05zbztUm9JhB697/XtQypXiQ34fUjhR0glP/9h1',
+    type    => 'ssh-rsa',
+    user    => 'root'
+  }
+
   # OS hardening
   if $::hostname =~ /kvm/ {
     class {'bastion':