Merge branch 'master' of git.nordu.net:sunet-opssunet-ops-2014-11-17-v01

3 files changed, 91 insertions, 22 deletions

diff --git a/global/overlay/etc/cosmos/keys/ft-505152DD.pub b/global/overlay/etc/cosmos/keys/ft-505152DD.pub
index 433fd6d..bf3c670 100644
--- a/global/overlay/etc/cosmos/keys/ft-505152DD.pub
+++ b/global/overlay/etc/cosmos/keys/ft-505152DD.pub
@@ -8,13 +8,13 @@ s8CiC82VftOr/QWKNys+kTGMgv0rpBgZ0ZmNe4qKTBKrVlzESMD/bWOVga70Rfsp
 MRY0cKK/V6gUDvaGtivg06SJNJzup8XzLYIclgwU3+U7c7YlseH7sUQlMUJ+Q2ij
 c+P3EkLNU2IOrJ/m9QwHl2EYG0GDaKz5IQGZABEBAAG0I0ZyZWRyaWsgVGh1bGlu
 IDxmcmVkcmlrQHRodWxpbi5uZXQ+iQE+BBMBCgAoAhsDBgsJCAcDAgYVCAIJCgsE
-FgIDAQIeAQIXgAUCU4LqJwUJAi5ZNQAKCRAZjBr9UFFS3Q7UCACOApsR4fqVXcZF
-49df+DxlGXLLzjiIL9dezduTcFqGAxFUCqC/hnw26UKmvUTshYvnUC336FCdg2u7
-oOxIE+u9+In3M8sqnNWax0lBG/Y3Gmk4YwJH1cL1phXwFDh4xU2xrGPS1hkVOtUO
-l8GEB+v+l9P/WgMMPbdNQr/J4UnlZ7jZpeE7QadbvCE7q1U1Rw9wYG9o5c/BzQ/X
-htQz/oedmZlyyftHppAL3jGjNWnSWf042hn9nFsPLpJjEXWy+XVo0pQOBfitt+Oj
-sap1DEyuAFqEwbVIQyGCTyXIwo88VnLxZ6EkR9VvX3RnccVr03izqk1JoULkmLh9
-USHxrBtCiQEcBBABCgAGBQJSQ+AeAAoJEE7yk05OqkIyTswH/jmbf6BKVwhpYNZz
+FgIDAQIeAQIXgAUCVGBu5gUJAwvd7AAKCRAZjBr9UFFS3SuaCACjOYwTuJAQVZof
+CEBW2ZAfYViQo5CtOUszDJFWS25uVRn60DyNkNjs2l4ZuzKtASzdxRJkV2y4a8rN
+raCF7GTQbzGnVrS2YuqZlfUBZxktbEvIxWlpr5ZplkibV9rB3jvtze44t+p5k1YZ
+mjdbenmurX/w9g5lAROPkulDjwhyEAxwaL+hwSHOupNjwS/QUAY0TavzmzMnbopu
+cfkpmuPv4zV9+SrkFcmv8pP9IRf6ehUsz0J3cqqI+I9aMcZkX3TaEPfqYysbkfhX
+bJTR4Z6rOiJEtoC7XmCrxjRmZXlxGL1kMHMRmI4UjCVCYmkzzoC+dSpQnXNhGqAv
+A5s78au0iQEcBBABCgAGBQJSQ+AeAAoJEE7yk05OqkIyTswH/jmbf6BKVwhpYNZz
 S/nlKGIhf0R0g4LPPOep25EwJfmUk54Mvi48/TBdZ9cy5Kwj3nlTXvviC72c7KvI
 ViZuZwO+jv0JOr2H5+xtT2zfWOeYFK0vlHPk1dUI++h84bnM/DCyGWdP6My1leRN
 VRySQI9E4NfHI03EN8fhoSKwHXfwrZOu5O8/8t4odJjo9IhnRiPvqFDqfbKDby+X
@@ -102,23 +102,23 @@ k04nWrAZbouOoNo+rx6iXNnShzHhmcnrNrBDL9DN98CBhX2EqptfRV5TSX7R/3Hg
 OBE23QT7TxL2mIVTR8E64NmJWV9Nu5uvQXng6elNzp19zhT655aD6H+IBFVCq/pq
 j29gwHTwII5SUvqtRo8xqJXUnWW287SS8BDwbp/PcStGv0mPn41bwVUiHIjlR3U7
 5BdlZkEWfsrIXaB9QyhTIrfTvcIhzx+E+Rph9LMRmQARAQABiQElBBgBCgAPAhsM
-BQJTguoABQkCLlkLAAoJEBmMGv1QUVLdwvAH/2a6O4YKBYomti04mqR0OUTnvfOd
-/9QJqZVymv6ArHzVYiTF4VwHqjziW2P/rjzkpUWSIwG0z6B/AIcOz+E+Fv4u5r7b
-S7k/iGwtfJ0ylEMpzBWOE9DeEw7zZ912U92zaBTJ1+2nz5IgcDnwpxV0mTfhf1Ah
-/vQpzZUjD2lVEBfaGe+YzmC/IJG/WpUikxqxXgVclU3ecoEx5w87qfD02VT2l4Ck
-o1dsmfwQcFaYnG5sayXpTqZl2ierAzLrBXPEpYoDTZqIJqAk9XlOW78ihLgv2O/J
-b2lGiVf6Ev7cS///6zhfyKj0j3wa/xHffQuDa7r7TeUIsE3Qb8KbvtGr0Si5AQ0E
+BQJUYG76BQkDC94HAAoJEBmMGv1QUVLdZzMH/jpMBYOB1hzYKnb9OGCHEkHYk853
+Ff/nC0k5QOEIm2hfArhomyZeGRdntybCMWQiQnTXpPhlVgYHFS4CBuGzRuNn7rjW
+AK8K8QsJwDKxwzzhmxiAmJkBZBugCXTpWh6vullvtSgo3z5U/zubPkozb3nfUocq
+69WGiARQa0SoMTglTZCr08AJ+05cLPULEJScSxT0CGj8RwITksbIXoApXikPOF9o
+SK1ujXAeP21NhtDDZ/rOXRsxuNQZoX/P5VEs8doN3uW1QCrmR0HHlOY/sd00Acm5
+RogZt0C12MPPPJHpAzb1yGSQ+d9BCPVnEXiwpTrho6/AUuCS+p0RZaxXD7S5AQ0E
 UkMpcAEIAKeyRGk3FYkT9iANHejqwxbDCZtQnx/ZIlrSAd8cz59zHELbNA33/2ao
 lLFLUT1B165FtseljERS0ehfS9KuaJr9UAsOJAAymznVEGqrpiWtiq8/9FvSFnRn
 j9iCNOiwt27U95POKHqbBvI00XT6Bj3zsiDfWpdDK00X70bWhJj12AECrnaW7XvR
 BdNHC6bgHoaHj+kKczrHH7udjaiqWC+XbBgdUA4nf1b2vjL2QGFxWznVe8mph6GN
 qjIph/X4/MDQWy+EmRm4brCzl4QZIH3SUDMobIVld5284uacWaoCtqgt64pqMcgU
-kN8o18cdtimfwREh9VbrqduqVcU7aDcAEQEAAYkBJQQYAQoADwIbIAUCU4LqGQUJ
-Ai0OpgAKCRAZjBr9UFFS3YUGB/9Jxu6OcKYfegT0LNaEZwhg/P1OetqX5SQfuhgt
-Jzvq3bogLQBI4InkRmCHR2KU6Hj5hjU9fRYXJ6JJS/ReceX2zcva+MCcHvtL/Qnp
-B7Womq8fjtbzhsbNRxhlCXX3/V8gDxmgPTdQ5mLW4LHuvE18GXHgzllkKJ+XXbBb
-JnA7/Yk+RI6G4s8mru1kj5Lb4R0/Io+0INnct6ZUUMHzAR1pSJD/tPS+Gh5tsDG9
-ijD9nCO+1soHkFl5vUO+aFGHgQkmXWaFUWBk/uCuDd08NDu/Ai5zGo1gt0yfPFgN
-9fuL1QPLE+OLY3p83BDtDZdEzmOLqL42Ntr38IczD+Gdvci/
-=yrrA
+kN8o18cdtimfwREh9VbrqduqVcU7aDcAEQEAAYkBJQQYAQoADwIbIAUCVGBvCAUJ
+AwqTlQAKCRAZjBr9UFFS3S08CACvFmEp+bkbhEoHdgdDXjtVjrfoI5Hahy2hb4SL
+BpzqkuGNf8VasO1h8Nf2YHbo5MUTptuEu7Nyt1jiIAhBDtgUuLZslGWIJ93G1p8Z
+pY3SetOCJ/BSCztxTpv5SARXrGSOwa8G8q/+0Y77tlHm1cM5PjG3PhDcpiVq331Z
+YEyjLP9UNMjpU03r3+2mIR1z7UinGl/hLToq2B5/k/vKH4crF6w+RS5trB6uvaKF
+cK+tjwwZsNVrk/th14gEb62UmomCbr6pHtr2sXk7Jpd5WWdkkfYWIKEf+UZb0Icu
+9Ynz6QuOn5YzHphkUTgCF9yLgnnonL4ammZDFdnWj2R2Talz
+=FWBw
 -----END PGP PUBLIC KEY BLOCK-----
diff --git a/global/overlay/etc/cosmos/keys/salu-82A313B2.pub b/global/overlay/etc/cosmos/keys/salu-82A313B2.pub
new file mode 100644
index 0000000..9fd5b1b
--- /dev/null
+++ b/global/overlay/etc/cosmos/keys/salu-82A313B2.pub
@@ -0,0 +1,61 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+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
+=oJeL
+-----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 1d08752..8813e1b 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -482,7 +482,7 @@ class sunet-dhcp-hosts {
    dhcp::host { 'auth-tug-1_eth0':      mac => "78:45:c4:f8:43:c5", ip => "130.242.130.205", hostname => 'auth-tug-1'; }
    dhcp::host { 'auth-tug-1_eth1':      mac => "78:45:c4:f8:43:c6", ip => "130.242.130.205", hostname => 'auth-tug-1'; }
 
-   dhcp::host { 'admin-tug-1':          mac => "52:54:00:a0:01:d4", ip => "130.242.130.212" }
+   dhcp::host { 'signup-tug-1':          mac => "52:54:00:a0:01:d4", ip => "130.242.130.212" }
 
    dhcp::host { 'dash-fre-1':           mac => "52:54:00:a0:01:d5", ip => "130.242.130.213" }
 
@@ -598,6 +598,14 @@ class sunetops {
      name   => 'lundberg+9303C5DB'
   }
 
+  ssh_authorized_key {'salu+82A313B2':
+     ensure => present,
+     name   => 'salu+82A313B2@nordu.net',
+     key    => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQDeqxYSykQRs9Wbh+uRCYqRUjsFfdlc4//bs3dbedE/8kZWvvSmBlcqizXKVSlABrwyqGDpxW9bD+lRC53zArDMaqYUQbkzYs0NYYeE1bA4HUI/f4SgDn7PKicJLcbIOFTEjdOAqoi+KXji6Y5kxmcNYcU/XbyUln7FCItIFTXLF6VJBR1edokXAtsQBeD+H+xJA34Ha4TkBPKSeYjt+OoCZSjW0cz9g/+T59WsLZ/uJPZNqTgP5QOnBBmqURXDosXhjfPRrUQAyySM9D0riqMY4gtUgVvvnSXZqgquk0/79JjR10QAFmauxRdYmTBG7NU8EM7bXqUeuEFQIl9aiIe3',
+     type   => 'ssh-rsa',
+     user   => 'root'
+  }
+
   # OS hardening
   if $::hostname =~ /kvm/ {
     class {'bastion':