summaryrefslogtreecommitdiff
path: root/puppet/modules/site_static
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2017-10-07 13:50:55 -0400
committerMicah Anderson <micah@riseup.net>2017-10-07 14:12:16 -0400
commit414e36cf11364a9e581eb260b3267078b6cdda44 (patch)
tree72f6e31027a3d27589c53b60a87e067f5cb4b055 /puppet/modules/site_static
parent35e3720a8c5cc6db1151c7cbe6172a8d5c511a32 (diff)
feat: add v3 tor hidden service support
Resolves: #8879
Diffstat (limited to 'puppet/modules/site_static')
-rw-r--r--puppet/modules/site_static/manifests/hidden_service.pp5
-rw-r--r--puppet/modules/site_static/manifests/init.pp5
2 files changed, 5 insertions, 5 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 40c6a28b..fdc5782f 100644
--- a/puppet/modules/site_static/manifests/init.pp
+++ b/puppet/modules/site_static/manifests/init.pp
@@ -60,10 +60,8 @@ class site_static {
include site_config::ruby::dev
if (member($formats, 'rack')) {
- include site_apt::preferences::passenger
class { 'passenger':
manage_munin => false,
- require => Class['site_apt::preferences::passenger']
}
}
@@ -81,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.