summaryrefslogtreecommitdiff
path: root/puppet/manifests
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2014-06-19 14:12:08 -0400
committerMicah Anderson <micah@leap.se>2014-06-19 14:12:08 -0400
commit9198af78956972a01aaf85e19753c5c9e62ea018 (patch)
tree7c2c4901c92528b2fababb0e4283d5bec6cd1aef /puppet/manifests
parent6100b6ded99241f10e7fb12c13a0820fda084912 (diff)
parentf991e8a4c877cff1d274fd1cac26488f8c3fda84 (diff)
Merge tag '0.5.2'
tagging 0.5.2 release
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/site.pp25
1 files changed, 12 insertions, 13 deletions
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index f8726fa9..9afa5dfd 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -1,45 +1,44 @@
# set a default exec path
Exec { path => '/usr/bin:/usr/sbin/:/bin:/sbin:/usr/local/bin:/usr/local/sbin' }
-# parse services for host
-$services=join(hiera_array('services', ['']), ' ')
-notice("Services for ${fqdn}: ${services}")
-
include site_config::setup
include site_config::default
-# configure eip
-if $services =~ /\bopenvpn\b/ {
+$services = hiera('services', [])
+$services_str = join($services, ', ')
+notice("Services for ${fqdn}: ${services_str}")
+
+if member($services, 'openvpn') {
include site_openvpn
}
-if $services =~ /\bcouchdb\b/ {
+if member($services, 'couchdb') {
include site_couchdb
include tapicero
}
-if $services =~ /\bwebapp\b/ {
+if member($services, 'webapp') {
include site_webapp
include site_nickserver
}
-if $services =~ /\bsoledad\b/ {
+if member($services, 'soledad') {
include soledad::server
}
-if $services =~ /\bmonitor\b/ {
+if member($services, 'monitor') {
include site_nagios
}
-if $services =~ /\btor\b/ {
+if member($services, 'tor') {
include site_tor
}
-if $services =~ /\bmx\b/ {
+if member($services, 'mx') {
include site_mx
}
-if $services =~ /\bstatic\b/ {
+if member($services, 'static') {
include site_static
}