diff options
author | elijah <elijah@riseup.net> | 2017-09-19 11:54:27 -0700 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2017-10-05 19:24:34 -0400 |
commit | 96f8af37b4a3bbd9a15651e27f588073c0601299 (patch) | |
tree | 9f2883b1aa100861bfd8d80c6d645d65d3a5e492 /puppet/modules/site_static/manifests/init.pp | |
parent | 18db08c95b0de9cf1ad511fa1dbb20f5eda8bbac (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/modules/site_static/manifests/init.pp')
-rw-r--r-- | puppet/modules/site_static/manifests/init.pp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/puppet/modules/site_static/manifests/init.pp b/puppet/modules/site_static/manifests/init.pp index 96d92f74..4ddce5ed 100644 --- a/puppet/modules/site_static/manifests/init.pp +++ b/puppet/modules/site_static/manifests/init.pp @@ -12,10 +12,10 @@ class site_static { $formats = $static['formats'] $bootstrap = $static['bootstrap_files'] $tor = hiera('tor', false) - if $tor and member($services, 'tor') and $tor['hidden_service']['active'] == true { - $tor_active = true + if $tor and member($services, 'hidden_service') { + $onion_active = true } else { - $tor_active = false + $onion_active = false } file { @@ -76,9 +76,9 @@ class site_static { } } - if $tor_active { + if $onion_active { $hidden_service = $tor['hidden_service'] - $tor_domain = "${hidden_service['address']}.onion" + $onion_domain = "${hidden_service['address']}.onion" class { 'site_static::hidden_service': single_hop => $hidden_service['single_hop'] } |