Merge tag '0.5.2'

tagging 0.5.2 release

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
 }