diff options
author | micah <micah@leap.se> | 2013-06-18 22:27:15 +0200 |
---|---|---|
committer | micah <micah@leap.se> | 2013-06-18 22:27:15 +0200 |
commit | cd9f0dc7d3fed744ea9bf695a497845a7297e1ca (patch) | |
tree | 2099b65ae2e8de4bf48b9c33dbb315d755418129 /puppet | |
parent | 85e8d0851e0f53c742c9e26133c250864ad71e8e (diff) | |
parent | 1f0aebf8a2edbf576b4d94c4f210b132b7b6084e (diff) |
Merge branch 'bug/2876' of /home/git/repositories/micah/leap_platform into develop
Diffstat (limited to 'puppet')
-rw-r--r-- | puppet/manifests/site.pp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp index 9e3d0232..f0319bc2 100644 --- a/puppet/manifests/site.pp +++ b/puppet/manifests/site.pp @@ -19,23 +19,23 @@ include site_config::slow # configure eip -if 'openvpn' in $services { +if $services =~ /\bopenvpn\b/ { include site_openvpn } -if 'couchdb' in $services { +if $services =~ /\bcouchdb\b/ { include site_couchdb } -if 'webapp' in $services { +if $services =~ /\bwebapp\b/ { include site_webapp include site_nickserver } -if 'monitor' in $services { +if $services =~ /\bmonitor\b/ { include site_nagios } -if 'tor' in $services { +if $services =~ /\btor\b/ { include site_tor } |