summaryrefslogtreecommitdiff
path: root/puppet/manifests
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2017-09-19 11:54:27 -0700
committerMicah Anderson <micah@riseup.net>2017-10-05 19:24:34 -0400
commit96f8af37b4a3bbd9a15651e27f588073c0601299 (patch)
tree9f2883b1aa100861bfd8d80c6d645d65d3a5e492 /puppet/manifests
parent18db08c95b0de9cf1ad511fa1dbb20f5eda8bbac (diff)
Feat: split tor service into three
The 'tor' service is now three separate services, 'tor_exit', 'tor_relay', or 'hidden_service'.
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/site.pp10
1 files changed, 9 insertions, 1 deletions
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index e243c5df..f3e752cc 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -44,10 +44,18 @@ node default {
include site_nagios
}
- if member($services, 'tor') {
+ if member($services, 'tor_relay') {
include site_tor::relay
}
+ if member($services, 'tor_exit') {
+ include site_tor::relay
+ }
+
+ if member($services, 'hidden_service') {
+ include site_tor::hidden_service
+ }
+
if member($services, 'mx') {
include site_mx
}