summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFredrik Thulin <fredrik@thulin.net>2014-03-22 12:38:41 +0100
committerFredrik Thulin <fredrik@thulin.net>2014-03-22 12:38:41 +0100
commitfb7879533b6f8bc915e4f2d34b52dcb8cc66a63e (patch)
treeb1ab6e4db59c7c7a30d40aef1870559a64a76daf
parentb7ff25f69696cf8272b526a3bd53a05cf1950e2f (diff)
Set default_lease_time and max_lease_time to suit eduID production.sunet-ops-2014-03-22-v01
-rw-r--r--global/overlay/etc/puppet/manifests/cosmos-site.pp12
1 files 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
}