diff options
| author | Micah Anderson <micah@riseup.net> | 2017-11-28 11:35:01 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2017-11-28 11:35:01 -0500 |
| commit | 0d251e2ceddd3e02ed8bba8725830689dbdd1397 (patch) | |
| tree | 37d7096d9e458ca1e6431dff8a2f571553011c44 /puppet/manifests/site.pp | |
| parent | 93a181d44e2d8163ae44945aac1b6477e268170d (diff) | |
| parent | bf6c56d86c7ba45e7ca766d990a9e9162025e5ac (diff) | |
Merge tag 'refs/tags/0.10.0' into stable
Release 0.10.0
Diffstat (limited to 'puppet/manifests/site.pp')
| -rw-r--r-- | puppet/manifests/site.pp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp index 3bf6a5c1..1f80c47c 100644 --- a/puppet/manifests/site.pp +++ b/puppet/manifests/site.pp @@ -44,8 +44,16 @@ node default { include site_nagios } - if member($services, 'tor') { - include site_tor + if member($services, 'tor_relay') { + include site_tor::relay + } + + if member($services, 'tor_exit') { + include site_tor::relay + } + + if member($services, 'tor_hidden_service') { + include site_tor::hidden_service } if member($services, 'mx') { |