projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
decommission chopin
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
0dd85be
..
93b79b2
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
@@
-70,9
+71,7
@@
node default {
if $::kernel == Linux {
include linux
if $::kernel == Linux {
include linux
- if $::kvmdomain {
- include acpi
- }
+ include acpi
} elsif $::kernel == 'GNU/kFreeBSD' {
include kfreebsd
}
} elsif $::kernel == 'GNU/kFreeBSD' {
include kfreebsd
}
@@
-90,7
+89,7
@@
node default {
}
if $::apache2 {
}
if $::apache2 {
- if
$::hostname in ![oyens]
{
+ if
!($::hostname in [oyens])
{
include apache2
}
}
include apache2
}
}
@@
-119,7
+118,7
@@
node default {
include samhain
}
include samhain
}
- if $::hostname in [
chopin,geo3,soler
,wieck] {
+ if $::hostname in [
geo3
,wieck] {
include debian-org::radvd
}
include debian-org::radvd
}
@@
-137,3
+136,4
@@
node default {
}
}
}
}
}
}
+