From 171fbc8356011fa66fb65956b425b02bf14e6a34 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Mon, 29 Sep 2014 13:41:26 +0200
Subject: aslund new key

---
 global/overlay/etc/cosmos/keys/aslund-46DC706D.pub | 42 ++++++++++++++++++++++
 global/overlay/etc/puppet/manifests/cosmos-site.pp |  6 ++--
 2 files changed, 45 insertions(+), 3 deletions(-)
 create mode 100644 global/overlay/etc/cosmos/keys/aslund-46DC706D.pub

diff --git a/global/overlay/etc/cosmos/keys/aslund-46DC706D.pub b/global/overlay/etc/cosmos/keys/aslund-46DC706D.pub
new file mode 100644
index 0000000..efd3510
--- /dev/null
+++ b/global/overlay/etc/cosmos/keys/aslund-46DC706D.pub
@@ -0,0 +1,42 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+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
+=pP5h
+-----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 59c029d..12ccbe3 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -9,8 +9,8 @@ Exec {
 include cosmos::tools
 include cosmos::motd
 include cosmos::ntp
-#include cosmos::rngtools
-#include cosmos::preseed
+include cosmos::rngtools
+include cosmos::preseed
 include ufw
 include apt
 include cosmos
@@ -499,7 +499,7 @@ class swamidops {
   }
   ssh_authorized_key {'aslund-umu':
      type   => 'ssh-rsa',
-     key    => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQCxFHI9HiyKFuZFjbsX9qcp9a5DEYu2C3uaroJdRLzt2HiqHDg8G3x63XLppzWOzmjT+vvIDvDTtiYJXXbNKU/0FCvfs0Z5/ujPh/GdUc8lTI7B1yVeHjk3hDATE1RqtIcHWEm7DM90fFxUxyTW0K2560wgTzZgZi1ElSJ/soiZv6eaO6k4X1AJzMzN/tHPzixWPnw0mU4sRMcmLPx32KwvUdmzEI3NglhXICbqEN4pxRFeQ7s19JvIZ7NVaS10D77l2YECsONViPHlN5fyYzvI58b8LotMHBmh3LEHn+M3wFMFKy1eVZ1qdMKmdmWcsnYmrSAGHH/JkLwJuh/uGs+Z',
+     key    => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQCZMok+obrCgHY0atsLp777lBrxvMYEHmHK0+DXHBnRBH9CK9gjquH3fmv/Eq1bHm4UUOOJ0zk67mVdFcOwX4p7XbxHolURLFPu1QBWgiT6vRGrWOthcDa1I5iSJ0ez7SBrtD4Si5juKq1T6mNVEbHn9NlOoGR4NVGQI1v90bywnhdT9m12Y487e4HYyjDE3G/S0v6Pkj4uaehrWHAbrgXYEkleuhGJesNQrfxDx31BZbqJs8wqZ9csgHaBgiiN/lplsZlL7GuHqytoSPKwVJ7EK/ZvFLir3IoP5G9IR0eUY4+SZUEjmxJL+JyBXGQJPJx1qIPiQZSb+38tBT2742Fx',
      ensure => present,
      user   => 'root',
      name   => 'fredrik.aslund@umu.se-yubikey-neo'
-- 
cgit v1.1