summaryrefslogtreecommitdiff
path: root/puppet/modules/site_obfsproxy/manifests
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2015-04-13 23:16:00 +0200
committervarac <varacanero@zeromail.org>2016-01-22 09:50:33 +0100
commit150579fb14716892cc3e4d7d9c0f81b30d56f03a (patch)
tree1cec18fffe6d70edd64696802cba264693f38ff5 /puppet/modules/site_obfsproxy/manifests
parentd87a8787908fb1c82901d9611a971c9bed0a3907 (diff)
restructured site.pp, now only one class gets included in site.pp per service (Bug #6851)
Also, moved global Exec{} defaults to site.pp Change-Id: I9ae91b77afde944d2f1312613b9d9030e32239dd
Diffstat (limited to 'puppet/modules/site_obfsproxy/manifests')
-rw-r--r--puppet/modules/site_obfsproxy/manifests/init.pp1
1 files changed, 1 insertions, 0 deletions
diff --git a/puppet/modules/site_obfsproxy/manifests/init.pp b/puppet/modules/site_obfsproxy/manifests/init.pp
index 6275ebee..b622588b 100644
--- a/puppet/modules/site_obfsproxy/manifests/init.pp
+++ b/puppet/modules/site_obfsproxy/manifests/init.pp
@@ -19,6 +19,7 @@ class site_obfsproxy {
$bind_address = hiera('ip_address')
}
+ include site_config::default
include site_apt::preferences::twisted
include site_apt::preferences::obfsproxy