From 2f8a17be10d7f065db4ed0ac29abe6659c2a9c43 Mon Sep 17 00:00:00 2001 From: Johan Lundberg Date: Tue, 4 Nov 2014 14:15:26 +0100 Subject: Renamed admin-tug-1 to signup-tug-1 --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'global/overlay/etc/puppet') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 147bc23..5d8af22 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -437,7 +437,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" } -- cgit v1.1 From 8e42fbe21eccd47022ae8b9b7ef2220f028f06ab Mon Sep 17 00:00:00 2001 From: Johan Lundberg Date: Fri, 14 Nov 2014 10:52:29 +0100 Subject: Added SSH and PGP key for Salu. --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'global/overlay/etc/puppet') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index f3961c5..850454f 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -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': -- cgit v1.1