projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
soler: decomission rt#5890
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
bce16e6
..
3ccacfe
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-38,6
+38,7
@@
node default {
include bacula::client
include autofs
include lvm
include bacula::client
include autofs
include lvm
+ include grub
include multipath
if $::lsbdistcodename == squeeze {
include roles::udldap::client
include multipath
if $::lsbdistcodename == squeeze {
include roles::udldap::client
@@
-90,7
+91,9
@@
node default {
}
if $::apache2 {
}
if $::apache2 {
- include apache2
+ if !($::hostname in [oyens]) {
+ include apache2
+ }
}
if $::hostname in [geo1,geo2,geo3] {
}
if $::hostname in [geo1,geo2,geo3] {
@@
-117,7
+120,7
@@
node default {
include samhain
}
include samhain
}
- if $::hostname in [chopin,geo3,
soler,
wieck] {
+ if $::hostname in [chopin,geo3,wieck] {
include debian-org::radvd
}
include debian-org::radvd
}
@@
-135,3
+138,4
@@
node default {
}
}
}
}
}
}
+