summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-09-25 18:25:27 +0200
committervarac <varacanero@zeromail.org>2014-09-25 18:25:27 +0200
commit2a959735ab0943137a3c00ec44b54f3787b644e0 (patch)
treee896b98df5e53113e6368702f4971aac5c66f1df /puppet/modules
parent6b28dd3a0725fa336bb1a4b08471811604601d0f (diff)
parent8f8862aab798cbf0b2dbb690a154cd54dd5d6592 (diff)
Merge branch 'irregulator/develop' into develop
Diffstat (limited to 'puppet/modules')
-rw-r--r--puppet/modules/site_obfsproxy/manifests/init.pp14
1 files changed, 7 insertions, 7 deletions
diff --git a/puppet/modules/site_obfsproxy/manifests/init.pp b/puppet/modules/site_obfsproxy/manifests/init.pp
index 40b7fba8..6275ebee 100644
--- a/puppet/modules/site_obfsproxy/manifests/init.pp
+++ b/puppet/modules/site_obfsproxy/manifests/init.pp
@@ -11,13 +11,13 @@ class site_obfsproxy {
$dest_ip = $obfsproxy['gateway_address']
$dest_port = '443'
- if $::services =~ /\bopenvpn\b/ {
- $openvpn = hiera('openvpn')
- $bind_address = $openvpn['gateway_address']
- }
- elsif $::services =~ /\bobfsproxy\b/ {
- $bind_address = hiera('ip_address')
- }
+ if member($::services, 'openvpn') {
+ $openvpn = hiera('openvpn')
+ $bind_address = $openvpn['gateway_address']
+ }
+ elsif member($::services, 'obfsproxy') {
+ $bind_address = hiera('ip_address')
+ }
include site_apt::preferences::twisted
include site_apt::preferences::obfsproxy