projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add puppet-dashboard ssl::service to puppetmaster
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
9b6d45b
..
9e0b813
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-40,10
+40,10
@@
node default {
include lvm
include multipath
if $::lsbdistcodename == squeeze {
include lvm
include multipath
if $::lsbdistcodename == squeeze {
- include roles::udlap::client
+ include roles::udl
d
ap::client
} else {
include roles::pubsub::client
} else {
include roles::pubsub::client
- class { 'roles::udlap::client':
+ class { 'roles::udl
d
ap::client':
ensure => absent
}
}
ensure => absent
}
}
@@
-97,9
+97,9
@@
node default {
include named::geodns
}
include named::geodns
}
-
if $::hostname in [diabelli,nono
] {
-
include dacs
- }
+
#if $::hostname in [diabelli,nono,tchaikovsky
] {
+
#
include dacs
+
#
}
if $::hostname in [stabile,beach,glinka,milanollo,rautavaara] {
include nfs-server
if $::hostname in [stabile,beach,glinka,milanollo,rautavaara] {
include nfs-server