projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mtatest'
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
0c178c1
..
29ac94f
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-20,7
+20,8
@@
Service {
node default {
# we really should rename this one
node default {
# we really should rename this one
- include site
+ include deprecated
+ include base
# this is magic: it will include whatever classes says we should
# include, based on the value of the "classes" array
# this is magic: it will include whatever classes says we should
# include, based on the value of the "classes" array
@@
-31,7
+32,7
@@
node default {
ensure => absent
}
ensure => absent
}
- if getfromhash($
site
::nodeinfo, 'ganeti') {
+ if getfromhash($
deprecated
::nodeinfo, 'ganeti') {
include ganeti2
}
include ganeti2
}
@@
-40,18
+41,6
@@
node default {
include acpi
}
include acpi
}
- if $::mta == 'exim4' {
- if getfromhash($site::nodeinfo, 'heavy_exim') {
- include exim::mx
- } else {
- include exim
- }
- } elsif $::mta == 'postfix' {
- include postfix
- } else {
- include exim
- }
-
if $::apache2 {
include apache2
}
if $::apache2 {
include apache2
}