summaryrefslogtreecommitdiff
path: root/puppet/modules/site_obfsproxy
diff options
context:
space:
mode:
authorMicah <micah@leap.se>2016-05-10 14:48:26 -0400
committerMicah <micah@leap.se>2016-05-10 14:48:26 -0400
commit86c85582065c391aa13c0b9b397dfd1aa2e2ac7b (patch)
tree7c027409a517d862864bf3650f4a8a66f615162d /puppet/modules/site_obfsproxy
parent70b1c648b94e6c007b9241a4661f33881e74485f (diff)
parent66b4c6b5ec6fe2f242020845fe92715ae2cdcc1e (diff)
Merge tag '0.8.0'
Release 0.8.0
Diffstat (limited to 'puppet/modules/site_obfsproxy')
-rw-r--r--puppet/modules/site_obfsproxy/manifests/init.pp3
1 files changed, 1 insertions, 2 deletions
diff --git a/puppet/modules/site_obfsproxy/manifests/init.pp b/puppet/modules/site_obfsproxy/manifests/init.pp
index 6275ebee..2ed5ec9e 100644
--- a/puppet/modules/site_obfsproxy/manifests/init.pp
+++ b/puppet/modules/site_obfsproxy/manifests/init.pp
@@ -19,8 +19,7 @@ class site_obfsproxy {
$bind_address = hiera('ip_address')
}
- include site_apt::preferences::twisted
- include site_apt::preferences::obfsproxy
+ include site_config::default
class { 'obfsproxy':
transport => $transport,