summaryrefslogtreecommitdiff
path: root/puppet/modules/site_obfsproxy/manifests
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2016-03-14 14:40:24 +0100
committervarac <varacanero@zeromail.org>2016-03-14 14:40:24 +0100
commit5f5f7255bb060b21b38f698b8a47e9bc89ec665e (patch)
treec274ba4f065a409e357ae209c49a457f2f0ab466 /puppet/modules/site_obfsproxy/manifests
parent4183a10168c61366448e39cf4db45eebc741a27e (diff)
parent65335becbf8602b65ed385090400088f56293d9b (diff)
Merge branch '7716_remove_obsolete_backports_pinning' into develop
Diffstat (limited to 'puppet/modules/site_obfsproxy/manifests')
-rw-r--r--puppet/modules/site_obfsproxy/manifests/init.pp2
1 files changed, 0 insertions, 2 deletions
diff --git a/puppet/modules/site_obfsproxy/manifests/init.pp b/puppet/modules/site_obfsproxy/manifests/init.pp
index b622588b..2ed5ec9e 100644
--- a/puppet/modules/site_obfsproxy/manifests/init.pp
+++ b/puppet/modules/site_obfsproxy/manifests/init.pp
@@ -20,8 +20,6 @@ class site_obfsproxy {
}
include site_config::default
- include site_apt::preferences::twisted
- include site_apt::preferences::obfsproxy
class { 'obfsproxy':
transport => $transport,