summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-06-18 16:02:03 -0400
committerMicah Anderson <micah@riseup.net>2013-06-18 16:02:03 -0400
commit1f0aebf8a2edbf576b4d94c4f210b132b7b6084e (patch)
tree2099b65ae2e8de4bf48b9c33dbb315d755418129
parent85e8d0851e0f53c742c9e26133c250864ad71e8e (diff)
The way we were testing if $services had a particular word in it is not very
good. If we search for the word 'tor' we will find it when the variable contains "monitor". This commit makes the regular expression more specific based on the word boundaries. Change-Id: I4dcd80db7322cabc3f71b77fabf7eacd83b4d572
-rw-r--r--puppet/manifests/site.pp10
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
}