Skip to content
Snippets Groups Projects
Verified Commit 414e36cf authored by micah's avatar micah :speech_balloon:
Browse files

feat: add v3 tor hidden service support

Resolves: #8879
parent 35e3720a
No related branches found
No related tags found
1 merge request!132Add v3 hidden service support
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
"public_key": "= tor_public_key_path(:node_tor_pub_key, tor.hidden_service.key_type)", "public_key": "= tor_public_key_path(:node_tor_pub_key, tor.hidden_service.key_type)",
"private_key": "= tor_private_key_path(:node_tor_priv_key, tor.hidden_service.key_type)", "private_key": "= tor_private_key_path(:node_tor_priv_key, tor.hidden_service.key_type)",
"address": "=> onion_address(:node_tor_pub_key)", "address": "=> onion_address(:node_tor_pub_key)",
"single_hop": false "single_hop": false,
"v3": false
} }
} }
} }
# create hidden service for static sites # 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'] Class['site_tor::hidden_service'] -> Class['site_static::hidden_service']
include site_tor::hidden_service include site_tor::hidden_service
tor::daemon::hidden_service { 'static': tor::daemon::hidden_service { 'static':
ports => [ '80 127.0.0.1:80'], ports => [ '80 127.0.0.1:80'],
single_hop => $single_hop single_hop => $single_hop,
v3 => $v3
} }
file { file {
......
...@@ -60,10 +60,8 @@ class site_static { ...@@ -60,10 +60,8 @@ class site_static {
include site_config::ruby::dev include site_config::ruby::dev
if (member($formats, 'rack')) { if (member($formats, 'rack')) {
include site_apt::preferences::passenger
class { 'passenger': class { 'passenger':
manage_munin => false, manage_munin => false,
require => Class['site_apt::preferences::passenger']
} }
} }
...@@ -81,7 +79,8 @@ class site_static { ...@@ -81,7 +79,8 @@ class site_static {
$hidden_service = $tor['hidden_service'] $hidden_service = $tor['hidden_service']
$onion_domain = "${hidden_service['address']}.onion" $onion_domain = "${hidden_service['address']}.onion"
class { 'site_static::hidden_service': 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. # Currently, we only support a single hidden service address per server.
......
...@@ -14,7 +14,8 @@ class site_webapp::hidden_service { ...@@ -14,7 +14,8 @@ class site_webapp::hidden_service {
tor::daemon::hidden_service { 'webapp': tor::daemon::hidden_service { 'webapp':
ports => [ '80 127.0.0.1:80'], ports => [ '80 127.0.0.1:80'],
single_hop => $hidden_service['single_hop'] single_hop => $hidden_service['single_hop'],
v3 => $hidden_service['v3']
} }
file { file {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment