diff options
| author | Micah Anderson <micah@riseup.net> | 2017-10-24 09:52:41 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2017-10-24 09:52:41 -0400 |
| commit | d25d23daf5e2185503ba6578523bc072ffe56b84 (patch) | |
| tree | b65ecff455b4a3fd93dc072e9819206734106515 /puppet/modules/site_static | |
| parent | a96fefa7cf9f9583adf5c152c19f53c8bdeca167 (diff) | |
| parent | 3478b7b46087971f4396de3ea370741694963ca9 (diff) | |
Merge remote-tracking branch 'my0xacab/feat/v3_hs'
Diffstat (limited to 'puppet/modules/site_static')
| -rw-r--r-- | puppet/modules/site_static/manifests/hidden_service.pp | 5 | ||||
| -rw-r--r-- | puppet/modules/site_static/manifests/init.pp | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/puppet/modules/site_static/manifests/hidden_service.pp b/puppet/modules/site_static/manifests/hidden_service.pp index f23727f7..c5d12c34 100644 --- a/puppet/modules/site_static/manifests/hidden_service.pp +++ b/puppet/modules/site_static/manifests/hidden_service.pp @@ -1,11 +1,12 @@ # create hidden service for static sites -class site_static::hidden_service ( $single_hop = false ) { +class site_static::hidden_service ( $single_hop = false, $v3 = false ) { Class['site_tor::hidden_service'] -> Class['site_static::hidden_service'] include site_tor::hidden_service tor::daemon::hidden_service { 'static': ports => [ '80 127.0.0.1:80'], - single_hop => $single_hop + single_hop => $single_hop, + v3 => $v3 } file { diff --git a/puppet/modules/site_static/manifests/init.pp b/puppet/modules/site_static/manifests/init.pp index 1a92c29e..fdc5782f 100644 --- a/puppet/modules/site_static/manifests/init.pp +++ b/puppet/modules/site_static/manifests/init.pp @@ -79,7 +79,8 @@ class site_static { $hidden_service = $tor['hidden_service'] $onion_domain = "${hidden_service['address']}.onion" class { 'site_static::hidden_service': - single_hop => $hidden_service['single_hop'] + single_hop => $hidden_service['single_hop'], + v3 => $hidden_service['v3'] } # Currently, we only support a single hidden service address per server. |