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 some more IPs for zobel
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
3bf505c
..
d7a965d
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-35,7
+35,7
@@
node default {
finzi,fano,fasch,field: { include kfreebsd }
}
finzi,fano,fasch,field: { include kfreebsd }
}
- if $::smartarraycontroller
== 'true'
{
+ if $::smartarraycontroller {
include debian-proliant
}
include debian-proliant
}
@@
-43,11
+43,11
@@
node default {
include megactl
}
include megactl
}
- if $::mptraid
== 'true'
{
+ if $::mptraid {
include raidmpt
}
include raidmpt
}
- if $::kvmdomain
== 'true'
{
+ if $::kvmdomain {
include acpi
}
include acpi
}
@@
-71,7
+71,7
@@
node default {
default: { include nagios::client }
}
default: { include nagios::client }
}
- if $::apache2
== 'true'
{
+ if $::apache2 {
if getfromhash($nodeinfo, 'apache2_security_mirror') {
include apache2::security_mirror
}
if getfromhash($nodeinfo, 'apache2_security_mirror') {
include apache2::security_mirror
}
@@
-87,7
+87,7
@@
node default {
include apache2
}
include apache2
}
- if $::rsyncd
== 'true'
{
+ if $::rsyncd {
include rsyncd-log
}
include rsyncd-log
}
@@
-127,22
+127,16
@@
node default {
}
}
}
}
- if $::brokenhosts
== 'true'
{
+ if $::brokenhosts {
include hosts
}
include hosts
}
- if $::portforwarder_user_exists
== 'true'
{
+ if $::portforwarder_user_exists {
include portforwarder
}
include samhain
include portforwarder
}
include samhain
- case $::hostname {
- byrd,schuetz,tchaikovsky,draghi,quantz,lamb,locke,rautavaara,rietz: {
- include krb
- }
- }
-
case $::hostname {
chopin,geo3,soler,wieck: {
include debian-radvd
case $::hostname {
chopin,geo3,soler,wieck: {
include debian-radvd
@@
-153,9
+147,7
@@
node default {
include entropykey
}
include entropykey
}
- if $::postgres84 == "true" {
- include postgres
- } elsif $::postgres90 == "true" {
+ if ($::postgres84 or $::postgres90) {
include postgres
}
}
include postgres
}
}