summaryrefslogtreecommitdiff
path: root/puppet/manifests
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-02-07 12:34:51 +0100
committervarac <varacanero@zeromail.org>2013-02-07 12:34:51 +0100
commit93a514a61ccfd656796d5b5cd143ea4cfacbc15b (patch)
tree37bb3f26e23060858336a5f5e38b5aac2fefc280 /puppet/manifests
parent07cc737f655c9fc0afe50e9850963120114ee18e (diff)
parent173b2dc3ecbdab2cacede4e50f6fa3f5daa3c683 (diff)
Merge branch 'feature/tor' into develop
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/site.pp4
1 files changed, 4 insertions, 0 deletions
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index 53b452d1..1ec806d9 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -33,3 +33,7 @@ if 'ca' in $services {
if 'monitor' in $services {
include site_nagios
}
+
+if 'tor' in $services {
+ include site_tor
+}