From f22c62301444ea8b667b4f7dfc00da2cf1eefc13 Mon Sep 17 00:00:00 2001 From: Fredrik Thulin Date: Thu, 30 Oct 2014 15:55:14 +0100 Subject: add proxy-tug-1.eduid.se --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 1 + 1 file changed, 1 insertion(+) diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 7676e61..bfb1cf9 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -429,6 +429,7 @@ class sunet-dhcp-hosts { dhcp::host { 'worker-fre-1': mac => "52:54:00:a0:01:c4", ip => "130.242.130.196" } dhcp::host { 'actions-tug-1': mac => "52:54:00:a0:01:c5", ip => "130.242.130.197" } dhcp::host { 'mq-tug-1': mac => "52:54:00:a0:01:c6", ip => "130.242.130.198" } + dhcp::host { 'proxy-tug-1': mac => "52:54:00:a0:01:c7", ip => "130.242.130.199" } dhcp::host { 'auth-fre-1_eth0': mac => "78:45:c4:f7:91:67", ip => "130.242.130.204", hostname => 'auth-fre-1'; } dhcp::host { 'auth-fre-1_eth1': mac => "78:45:c4:f7:91:68", ip => "130.242.130.204", hostname => 'auth-fre-1'; } -- cgit v1.1 From 1b8a71864d67260831806d6821cc8fd849fbbd5e Mon Sep 17 00:00:00 2001 From: Johan Lundberg Date: Mon, 3 Nov 2014 16:47:28 +0100 Subject: Added public ssh key lundberg+9303C5DB --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index bfb1cf9..8a46d63 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -597,6 +597,13 @@ class swamidops { user => 'root', name => 'fredrik.aslund@umu.se-yubikey-neo' } + ssh_authorized_key {'lundberg+9303C5DB': + type => 'ssh-rsa', + key => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQDAHMfn9PSWjGGAkMY6rh1yffdYgnlhoIC5E5NWdc5XUlY9oNYW2zhMpyhepfoh1YYv5V1QNTuO3f0zhD+ZeqPvnnA74fBM4yvWU4Qttwv2drsFOsU7nRbGSwQdww9IDidtxRuAjW5HJ9mTOJuYrIFAEHgg1Pv8sZKzHNWuZiz4I34CN2NbaZOu4eYG6pdzvB6kfYl5iL/esfhBZfegA+7x4qXvMLHEKb7wCRBABCfWu6Yy1E0jUdRWBFdqp5zsjuQlk8minh892m2C1tFcyub5dCWgLYtiQRpIjz16lMk1cM+fgS9YM7Ev62bBpRynU2wCfg1QpYMpxIq54q/XLlYv', + ensure => present, + user => 'root', + name => 'lundberg+9303C5DB' + } } node 'wp.sunet.se' { -- cgit v1.1 From 4510588f444c64fd38b411f39e18946d34c1488d Mon Sep 17 00:00:00 2001 From: Johan Lundberg Date: Mon, 3 Nov 2014 17:33:43 +0100 Subject: Added an ethernet alias. --- .../overlay/etc/network/interfaces | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 sto-tug-kvm2.swamid.se/overlay/etc/network/interfaces diff --git a/sto-tug-kvm2.swamid.se/overlay/etc/network/interfaces b/sto-tug-kvm2.swamid.se/overlay/etc/network/interfaces new file mode 100644 index 0000000..10cdcf5 --- /dev/null +++ b/sto-tug-kvm2.swamid.se/overlay/etc/network/interfaces @@ -0,0 +1,41 @@ +# This file describes the network interfaces available on your system +# and how to activate them. For more information, see interfaces(5). + +# The loopback network interface +auto lo +iface lo inet loopback + +# The primary network interface +auto em1 +iface em1 inet static + address 192.36.125.9 + netmask 255.255.255.0 + network 192.36.125.0 + broadcast 192.36.125.255 + gateway 192.36.125.1 + # dns-* options are implemented by the resolvconf package, if installed + dns-nameservers 130.242.80.14 130.242.80.99 + dns-search swamid.se + +iface em1 inet6 static + address 2001:6b0:7::9 + netmask 64 + gateway 2001:6b0:7::1 + dns-nameservers 2001:6b0:1e:14 2001:6b0:1e:99 + +auto em1:0 +iface em1:0 inet static + address 192.36.125.10 + netmask 255.255.255.0 + network 192.36.125.0 + broadcast 192.36.125.255 + gateway 192.36.125.1 + # dns-* options are implemented by the resolvconf package, if installed + dns-nameservers 130.242.80.14 130.242.80.99 + dns-search sunet.se + +iface em1:0 inet6 static + address 2001:6b0:7::10 + netmask 64 + gateway 2001:6b0:7::1 + dns-nameservers 2001:6b0:1e:14 2001:6b0:1e:99 -- cgit v1.1 From 098ee627431c59d30d29e234dd64e5e4cfdad821 Mon Sep 17 00:00:00 2001 From: Johan Lundberg Date: Tue, 4 Nov 2014 12:55:20 +0100 Subject: Moved lundberg pub key from swamid-ops to sunet-ops --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 8a46d63..147bc23 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -545,6 +545,14 @@ class sunetops { user => 'root' } + ssh_authorized_key {'lundberg+9303C5DB': + type => 'ssh-rsa', + key => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQDAHMfn9PSWjGGAkMY6rh1yffdYgnlhoIC5E5NWdc5XUlY9oNYW2zhMpyhepfoh1YYv5V1QNTuO3f0zhD+ZeqPvnnA74fBM4yvWU4Qttwv2drsFOsU7nRbGSwQdww9IDidtxRuAjW5HJ9mTOJuYrIFAEHgg1Pv8sZKzHNWuZiz4I34CN2NbaZOu4eYG6pdzvB6kfYl5iL/esfhBZfegA+7x4qXvMLHEKb7wCRBABCfWu6Yy1E0jUdRWBFdqp5zsjuQlk8minh892m2C1tFcyub5dCWgLYtiQRpIjz16lMk1cM+fgS9YM7Ev62bBpRynU2wCfg1QpYMpxIq54q/XLlYv', + ensure => present, + user => 'root', + name => 'lundberg+9303C5DB' + } + # OS hardening if $::hostname =~ /kvm/ { class {'bastion': @@ -597,13 +605,6 @@ class swamidops { user => 'root', name => 'fredrik.aslund@umu.se-yubikey-neo' } - ssh_authorized_key {'lundberg+9303C5DB': - type => 'ssh-rsa', - key => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQDAHMfn9PSWjGGAkMY6rh1yffdYgnlhoIC5E5NWdc5XUlY9oNYW2zhMpyhepfoh1YYv5V1QNTuO3f0zhD+ZeqPvnnA74fBM4yvWU4Qttwv2drsFOsU7nRbGSwQdww9IDidtxRuAjW5HJ9mTOJuYrIFAEHgg1Pv8sZKzHNWuZiz4I34CN2NbaZOu4eYG6pdzvB6kfYl5iL/esfhBZfegA+7x4qXvMLHEKb7wCRBABCfWu6Yy1E0jUdRWBFdqp5zsjuQlk8minh892m2C1tFcyub5dCWgLYtiQRpIjz16lMk1cM+fgS9YM7Ev62bBpRynU2wCfg1QpYMpxIq54q/XLlYv', - ensure => present, - user => 'root', - name => 'lundberg+9303C5DB' - } } node 'wp.sunet.se' { -- cgit v1.1