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

Merge remote-tracking branch 'my0xacab/feat/v3_hs'

parents a96fefa7 3478b7b4
Branches
Tags
No related merge requests found
...@@ -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 {
......
...@@ -79,7 +79,8 @@ class site_static { ...@@ -79,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 {
......
...@@ -6,6 +6,6 @@ ...@@ -6,6 +6,6 @@
[subrepo] [subrepo]
remote = https://leap.se/git/puppet_tor remote = https://leap.se/git/puppet_tor
branch = master branch = master
commit = 5ef29012dccc90e68afc215be9521629a0903bc6 commit = 4380e2eabd94d8f0df7f63c642dd46ec4783ef07
parent = 747d3e9b55c8b7b7d98a63474b6de82d7114c389 parent = be4182d7227d57b4da20d088b4750c756f759888
cmdver = 0.4.0 cmdver = 0.3.1
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
define tor::daemon::hidden_service( define tor::daemon::hidden_service(
$ports = [], $ports = [],
$single_hop = false, $single_hop = false,
$v3 = false,
$data_dir = $tor::daemon::data_dir, $data_dir = $tor::daemon::data_dir,
$ensure = present ) { $ensure = present ) {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<% if @port != '0' -%> <% if @port != '0' -%>
DirPort <%= @port %> DirPort <%= @port %>
<% end -%> <% end -%>
<% listen_addresses.each do |listen_address| -%> <% @listen_addresses.each do |listen_address| -%>
DirListenAddress <%= listen_address %> DirListenAddress <%= listen_address %>
<% end -%> <% end -%>
<% if @port_front_page != '' -%> <% if @port_front_page != '' -%>
......
...@@ -10,3 +10,11 @@ HiddenServiceDir <%= @data_dir %>/<%= @name %> ...@@ -10,3 +10,11 @@ HiddenServiceDir <%= @data_dir %>/<%= @name %>
HiddenServicePort <%= port %> HiddenServicePort <%= port %>
<% end -%> <% end -%>
<% if @v3 != false %>
# hidden service v3 static
HiddenServiceDir <%= @data_dir %>/<%= @name -%>3
HiddenServiceVersion 3
<% @ports.each do |port| -%>
HiddenServicePort <%= port %>
<% end -%>
<% end -%>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment