From d10c087ba54922c52e8b1e1dd3bb53b31a138623 Mon Sep 17 00:00:00 2001 From: Fredrik Thulin Date: Mon, 17 Mar 2014 13:07:11 +0100 Subject: rename eduID site tug servers for production --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 34 +++++++++++----------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 909116c..e3381da 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -164,34 +164,34 @@ class sunet-dhcp-hosts { # eduID TUG hosts - dhcp::host { 'kvmidp-tug-2_eth0': mac => "24:b6:fd:fe:fa:51", ip => "130.242.130.4", hostname => 'kvmidp-tug-2'; } - dhcp::host { 'kvmidp-tug-2_eth1': mac => "24:b6:fd:fe:fa:52", ip => "130.242.130.4", hostname => 'kvmidp-tug-2'; } + dhcp::host { 'kvmidp-tug-3_eth0': mac => "24:b6:fd:fe:fa:51", ip => "130.242.130.4", hostname => 'kvmidp-tug-3'; } + dhcp::host { 'kvmidp-tug-3_eth1': mac => "24:b6:fd:fe:fa:52", ip => "130.242.130.4", hostname => 'kvmidp-tug-3'; } - dhcp::host { 'idp-tug-2a': mac => "52:54:00:01:00:01", ip => "130.242.130.5"; } + dhcp::host { 'idp-tug-3a': mac => "52:54:00:01:00:01", ip => "130.242.130.5"; } - dhcp::host { 'idp-tug-2b': mac => "52:54:00:01:00:02", ip => "130.242.130.6"; } + dhcp::host { 'idp-tug-3b': mac => "52:54:00:01:00:02", ip => "130.242.130.6"; } - dhcp::host { 'auth-tug-2_eth0': mac => "f0:4d:a2:73:4e:9b", ip => "130.242.130.12", hostname => 'auth-tug-2'; } - dhcp::host { 'auth-tug-2_eth1': mac => "f0:4d:a2:73:4e:9c", ip => "130.242.130.12", hostname => 'auth-tug-2'; } + dhcp::host { 'auth-tug-3_eth0': mac => "f0:4d:a2:73:4e:9b", ip => "130.242.130.12", hostname => 'auth-tug-3'; } + dhcp::host { 'auth-tug-3_eth1': mac => "f0:4d:a2:73:4e:9c", ip => "130.242.130.12", hostname => 'auth-tug-3'; } - dhcp::host { 'kvm-tug-2_eth0': mac => "f0:4d:a2:73:4f:82", ip => "130.242.130.20", hostname => 'kvm-tug-2'; } - dhcp::host { 'kvm-tug-2_eth1': mac => "f0:4d:a2:73:4f:83", ip => "130.242.130.20", hostname => 'kvm-tug-2'; } + dhcp::host { 'kvm-tug-3_eth0': mac => "f0:4d:a2:73:4f:82", ip => "130.242.130.20", hostname => 'kvm-tug-3'; } + dhcp::host { 'kvm-tug-3_eth1': mac => "f0:4d:a2:73:4f:83", ip => "130.242.130.20", hostname => 'kvm-tug-3'; } - dhcp::host { 'db-tug-2_eth0': mac => "24:b6:fd:fe:fa:f0", ip => "130.242.130.21", hostname => 'db-tug-2'; } - dhcp::host { 'db-tug-2_eth1': mac => "24:b6:fd:fe:fa:f1", ip => "130.242.130.21", hostname => 'db-tug-2'; } + dhcp::host { 'db-tug-3_eth0': mac => "24:b6:fd:fe:fa:f0", ip => "130.242.130.21", hostname => 'db-tug-3'; } + dhcp::host { 'db-tug-3_eth1': mac => "24:b6:fd:fe:fa:f1", ip => "130.242.130.21", hostname => 'db-tug-3'; } - dhcp::host { 'mq-tug-2': mac => "52:54:00:03:00:22", ip => "130.242.130.22"; } + #dhcp::host { 'mq-tug-3': mac => "52:54:00:03:00:22", ip => "130.242.130.22"; } - dhcp::host { 'worker-tug-2': mac => "52:54:00:03:00:23", ip => "130.242.130.23"; } + #dhcp::host { 'worker-tug-3': mac => "52:54:00:03:00:23", ip => "130.242.130.23"; } - dhcp::host { 'signup-tug-2': mac => "52:54:00:03:00:24", ip => "130.242.130.24"; } + #dhcp::host { 'signup-tug-3': mac => "52:54:00:03:00:24", ip => "130.242.130.24"; } - dhcp::host { 'helpdesk-tug-2': mac => "52:54:00:03:00:25", ip => "130.242.130.25"; } + dhcp::host { 'helpdesk-tug-3': mac => "52:54:00:03:00:25", ip => "130.242.130.25"; } - dhcp::host { 'www-tug-2': mac => "52:54:00:03:00:26", ip => "130.242.130.26"; } + dhcp::host { 'www-tug-3': mac => "52:54:00:03:00:26", ip => "130.242.130.26"; } - dhcp::host { 'dashboard-tug-2_eth0': mac => "f0:4d:a2:73:4f:0d", ip => "130.242.130.30", hostname => 'dashboard-tug-2'; } - dhcp::host { 'dashboard-tug-2_eth1': mac => "f0:4d:a2:73:4f:0e", ip => "130.242.130.30", hostname => 'dashboard-tug-2'; } + dhcp::host { 'kvmapp-tug-3_eth0': mac => "f0:4d:a2:73:4f:0d", ip => "130.242.130.30", hostname => 'kvmapp-tug-3'; } + dhcp::host { 'kvmapp-tug-3_eth1': mac => "f0:4d:a2:73:4f:0e", ip => "130.242.130.30", hostname => 'kvmapp-tug-3'; } # eduID FRE hosts -- cgit v1.1 From b7ff25f69696cf8272b526a3bd53a05cf1950e2f Mon Sep 17 00:00:00 2001 From: Fredrik Thulin Date: Fri, 21 Mar 2014 12:15:43 +0100 Subject: rename db-lla-2 -> db-lla-3 --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index e3381da..795ee99 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -223,8 +223,8 @@ class sunet-dhcp-hosts { # eduID LLA hosts - dhcp::host { 'db-lla-2_eth0': mac => "f0:4d:a2:73:4e:08", ip => "130.242.130.148", hostname => 'db-lla-2'; } - dhcp::host { 'db-lla-2_eth1': mac => "f0:4d:a2:73:4e:09", ip => "130.242.130.148", hostname => 'db-lla-2'; } + dhcp::host { 'db-lla-3_eth0': mac => "f0:4d:a2:73:4e:08", ip => "130.242.130.148", hostname => 'db-lla-3'; } + dhcp::host { 'db-lla-3_eth1': mac => "f0:4d:a2:73:4e:09", ip => "130.242.130.148", hostname => 'db-lla-3'; } -- cgit v1.1 From fb7879533b6f8bc915e4f2d34b52dcb8cc66a63e Mon Sep 17 00:00:00 2001 From: Fredrik Thulin Date: Sat, 22 Mar 2014 12:38:41 +0100 Subject: Set default_lease_time and max_lease_time to suit eduID production. --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 795ee99..6c43488 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -51,7 +51,9 @@ node 'sto-tug-kvm1.swamid.se' { ntpservers => ['ntp1.nordu.net','ntp2.nordu.net','Time1.Stupi.SE'], interfaces => ['eth0'], #pxeserver => '130.242.125.5', - #pxefilename => 'pxelinux.0' + #pxefilename => 'pxelinux.0', + default_lease_time => '86400', + max_lease_time => '172800', } class { 'sunet-dhcp-hosts': } @@ -59,7 +61,7 @@ node 'sto-tug-kvm1.swamid.se' { } node 'sto-tug-kvm-lab1.swamid.se' { - + package {'python-vm-builder': ensure => 'installed', } -> @@ -347,7 +349,7 @@ node 'samltest.swamid.se' { user => 'root', name => 'roland.hedberg@adm.umu.se' } - + } class swamidops { @@ -370,7 +372,7 @@ class swamidops { key => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQC1fzNy2/nmIwyrHX2FJhjmkfc0BKqVMBKJoM+NyNI9T0tWe/Vmpa4xnRwZ/qBZgk1Gh2ttjY+PiT9Y1VXQLJ7YMNJezoD5xT3MmOlj5vQPP2d6ZC+pqADatBUpdnI65GQZfXSbiYVpc3b/WzieYKoGo8wk1JuXF1McEH5oXViUW96R4PuB+nXowSE1a7lmLXIiWov/qHa+5LwZQ8l8Xw46gh6AOtnvKJeUsgUvGMC/SnSBiZrfruyQCvNrzdjFQHKW79sWRPRBfU356583QmuqYprQ5gINA4zVbwfT1xaFYqsb+/IUX+Hcw5wlWdfTxhzvzelgg0qVVvRrqEhwMtgN', ensure => present, user => 'root', - name => 'fredrik.aslund@umu.se/epass2003/130409' + name => 'fredrik.aslund@umu.se/epass2003/130409' } } @@ -381,7 +383,7 @@ node 'dane.lab.sunet.se' { node 'wp.sunet.se' { package {'libapache2-mod-php5': ensure => 'latest'} package {'php5-mysql': ensure => 'latest'} - class {'apache': + class {'apache': mpm_module => 'prefork', default_vhost => false } -- cgit v1.1 From eab648e6b108ed7080c58e43d673a11bc65925cd Mon Sep 17 00:00:00 2001 From: Fredrik Thulin Date: Mon, 24 Mar 2014 08:31:43 +0100 Subject: add monitor-tug-3 --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 6c43488..086d66e 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -182,18 +182,15 @@ class sunet-dhcp-hosts { dhcp::host { 'db-tug-3_eth0': mac => "24:b6:fd:fe:fa:f0", ip => "130.242.130.21", hostname => 'db-tug-3'; } dhcp::host { 'db-tug-3_eth1': mac => "24:b6:fd:fe:fa:f1", ip => "130.242.130.21", hostname => 'db-tug-3'; } - #dhcp::host { 'mq-tug-3': mac => "52:54:00:03:00:22", ip => "130.242.130.22"; } - - #dhcp::host { 'worker-tug-3': mac => "52:54:00:03:00:23", ip => "130.242.130.23"; } - - #dhcp::host { 'signup-tug-3': mac => "52:54:00:03:00:24", ip => "130.242.130.24"; } - + dhcp::host { 'mq-tug-3': mac => "52:54:00:03:00:22", ip => "130.242.130.22"; } + dhcp::host { 'worker-tug-3': mac => "52:54:00:03:00:23", ip => "130.242.130.23"; } + dhcp::host { 'signup-tug-3': mac => "52:54:00:03:00:24", ip => "130.242.130.24"; } dhcp::host { 'helpdesk-tug-3': mac => "52:54:00:03:00:25", ip => "130.242.130.25"; } - dhcp::host { 'www-tug-3': mac => "52:54:00:03:00:26", ip => "130.242.130.26"; } + dhcp::host { 'monitor-tug-3': mac => "52:54:00:03:00:26", ip => "130.242.130.27"; } - dhcp::host { 'kvmapp-tug-3_eth0': mac => "f0:4d:a2:73:4f:0d", ip => "130.242.130.30", hostname => 'kvmapp-tug-3'; } - dhcp::host { 'kvmapp-tug-3_eth1': mac => "f0:4d:a2:73:4f:0e", ip => "130.242.130.30", hostname => 'kvmapp-tug-3'; } + dhcp::host { 'kvmapp-tug-3_eth0': mac => "f0:4d:a2:73:4f:0d", ip => "130.242.130.30", hostname => 'kvmapp-tug-3'; } + dhcp::host { 'kvmapp-tug-3_eth1': mac => "f0:4d:a2:73:4f:0e", ip => "130.242.130.30", hostname => 'kvmapp-tug-3'; } # eduID FRE hosts -- cgit v1.1 From b1cce5a45d8edf89647d5ef6a45b618793cf3949 Mon Sep 17 00:00:00 2001 From: Fredrik Thulin Date: Mon, 24 Mar 2014 10:08:54 +0100 Subject: typo in mac address --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 086d66e..4530f3e 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -187,7 +187,7 @@ class sunet-dhcp-hosts { dhcp::host { 'signup-tug-3': mac => "52:54:00:03:00:24", ip => "130.242.130.24"; } dhcp::host { 'helpdesk-tug-3': mac => "52:54:00:03:00:25", ip => "130.242.130.25"; } dhcp::host { 'www-tug-3': mac => "52:54:00:03:00:26", ip => "130.242.130.26"; } - dhcp::host { 'monitor-tug-3': mac => "52:54:00:03:00:26", ip => "130.242.130.27"; } + dhcp::host { 'monitor-tug-3': mac => "52:54:00:03:00:27", ip => "130.242.130.27"; } dhcp::host { 'kvmapp-tug-3_eth0': mac => "f0:4d:a2:73:4f:0d", ip => "130.242.130.30", hostname => 'kvmapp-tug-3'; } dhcp::host { 'kvmapp-tug-3_eth1': mac => "f0:4d:a2:73:4f:0e", ip => "130.242.130.30", hostname => 'kvmapp-tug-3'; } -- cgit v1.1 From 10d9b18fb5285d4a5e1f41d37b9c9227e3d8ba85 Mon Sep 17 00:00:00 2001 From: Fredrik Thulin Date: Mon, 24 Mar 2014 13:53:46 +0100 Subject: bump expire date --- global/overlay/etc/cosmos/keys/ft-4030CCAD.pub | 47 ++++++++++++++++++-------- 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/global/overlay/etc/cosmos/keys/ft-4030CCAD.pub b/global/overlay/etc/cosmos/keys/ft-4030CCAD.pub index 382e9aa..8b04a43 100644 --- a/global/overlay/etc/cosmos/keys/ft-4030CCAD.pub +++ b/global/overlay/etc/cosmos/keys/ft-4030CCAD.pub @@ -14,18 +14,37 @@ CACsroVddZd3IONomyLWEa6h2X/L5gF0N/VnSB+pXHqDETJ4u9UTC+be8pqlIhfA dkfPlQOxUbqXwXnjQy8UlnJAl0lFclugercS/Q1Ij1eEZi4UIadLlbAxw5HzpQsr 7+z2MJEpX8NW7ZEGhXbU6ULJV0+q5YKiAkrX1VTM/4yJ5lZLZSLfXAlBjmSqDBS5 uc5jG6E6ORkXUDlGwV17LY8b4pn3mCTN6vR6eGu9ZFgRzjbMcZVHW0wcA4e4eouK -HiaktvQ+qDSpefaCfj8aI7xHuQENBFKc1s0BCACXeL1RFvXY3AEhm+AtLvKJQNjo -cgEk/UZp+P3+e0MmVf9BR1O5+NW2mBH3mO6itUv0w2R2athJCdKR8MW4WLpJ1myi -nR7bBFOZS7XxZM5acN4WSN3b6d/E+7YUVWw4CM6IqWMUdVKtOAMCIuP4eU6QHGcb -yDTtBYUzEA1eP55pyFEKe46dJ8tdIgyGePoAsEqijud1VtwQ5fH8/WuGzTKPUWcc -KmFPEcubgam1od+jTt9UOnpG2r3Gi0hp7C4HqpqADf+sqo00kQi7kEXWgjZ5SZxx -vzOMUu9mg0HtXEyQs2HYPD0NXSsfEN6kO5Rwy6SJcsSgfQ6CxMipS7XuBfWHABEB -AAGJASUEGAECAA8FAlKc1s0CGwwFCQAlzOMACgkQJwczDUAwzK0arAf/cAqiOFPR -6Ov8qtV2xcDbod+/l0J0eoW7cnoNfeaJSzVr1ZFpfGWbDbX1dlq562Z2fkk20Ls8 -DCm+zfadvRUUUaxVF1TgFjaH88wR9Q5FjFfCUIErilKJO+4CTeMQhVqIGqLNiEk+ -9nv81yLWoPkMX8iXXVa/5TrmDR/jfWzKJTGbF/HrukriSTCpJDrnrvzgS3Dss4KR -MIGG/utS35rkLgn9mCA3/lO+W+tTi/4kjZLnGJ+aAA0OFIZ1cMzRnf61ZxpenyDF -2GWRa05a+XRo0WyYPCfFtr9kkN2F5gPYDXKf68jo5HJi0R6jLOkg4f4oXFPytKhX -JhCC/EV8NygYlA== -=pVDS +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 +mA== +=3gw+ -----END PGP PUBLIC KEY BLOCK----- -- cgit v1.1