summaryrefslogtreecommitdiff
path: root/puppet/manifests/site.pp
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2014-07-01 16:06:22 -0700
committerelijah <elijah@riseup.net>2014-07-01 16:06:22 -0700
commitb2f184c027c166c86c2c2e434389542e42bd9304 (patch)
tree3c7e703452da8c4caca3469f08c63f4e3041b71c /puppet/manifests/site.pp
parent82dbbf823d6637082f63e55ed1d2f57a11e0d481 (diff)
parent7e278f92f34e3809d380be724f0c306430791b10 (diff)
Merge branch 'obfsproxy' into develop
Diffstat (limited to 'puppet/manifests/site.pp')
-rw-r--r--puppet/manifests/site.pp5
1 files changed, 5 insertions, 0 deletions
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index 9afa5dfd..57942d99 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -10,6 +10,7 @@ notice("Services for ${fqdn}: ${services_str}")
if member($services, 'openvpn') {
include site_openvpn
+ include site_obfsproxy
}
if member($services, 'couchdb') {
@@ -42,4 +43,8 @@ if member($services, 'static') {
include site_static
}
+if member($services, 'obfsproxy') {
+ include site_obfsproxy
+}
+
include site_config::packages::uninstall