projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
packages -> hiera role; explicitly include apache2
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
3e4e39d
..
6ff112d
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-20,7
+20,7
@@
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 base
# this is magic: it will include whatever classes says we should
@@
-32,7
+32,7
@@
node default {
ensure => absent
}
ensure => absent
}
- if getfromhash($
site
::nodeinfo, 'ganeti') {
+ if getfromhash($
deprecated
::nodeinfo, 'ganeti') {
include ganeti2
}
include ganeti2
}
@@
-42,7
+42,7
@@
node default {
}
if $::mta == 'exim4' {
}
if $::mta == 'exim4' {
- if getfromhash($
site
::nodeinfo, 'heavy_exim') {
+ if getfromhash($
deprecated
::nodeinfo, 'heavy_exim') {
include exim::mx
} else {
include exim
include exim::mx
} else {
include exim