From 7810400fcd09ec4805632981c2034706ab07720f Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 27 Aug 2013 18:19:24 +0200 Subject: tor service:obfuscate contact email addr (Feature #3479) --- puppet/modules/site_tor/manifests/init.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'puppet/modules/site_tor') diff --git a/puppet/modules/site_tor/manifests/init.pp b/puppet/modules/site_tor/manifests/init.pp index 50ab636b..ac830f0d 100644 --- a/puppet/modules/site_tor/manifests/init.pp +++ b/puppet/modules/site_tor/manifests/init.pp @@ -13,7 +13,7 @@ class site_tor { tor::daemon::relay { $nickname: port => 9001, address => $address, - contact_info => $contact_email, + contact_info => obfuscate_email($contact_email), bandwidth_rate => $bandwidth_rate, my_family => '$2A431444756B0E7228A7918C85A8DACFF7E3B050', } -- cgit v1.2.3 From 3388336b57cc59617b6dc8380beeeacfdb2fb5b3 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Wed, 18 Sep 2013 12:05:10 -0400 Subject: Setup a class dependency for every tag 'leap_service' to make sure that shorewall is setup before the service is setup. This is necessary due to the strict initial firewall that stops various service setup operations from happening, but is relaxed once shorewall is setup properly (#3782) Change-Id: Ia9640c4118aa0053cdb99e7bc11860fed5527501 --- puppet/modules/site_tor/manifests/init.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'puppet/modules/site_tor') diff --git a/puppet/modules/site_tor/manifests/init.pp b/puppet/modules/site_tor/manifests/init.pp index ac830f0d..16ee4c30 100644 --- a/puppet/modules/site_tor/manifests/init.pp +++ b/puppet/modules/site_tor/manifests/init.pp @@ -1,6 +1,7 @@ class site_tor { tag 'leap_service' - + Class['site_config::default'] -> Class['site_tor'] + $tor = hiera('tor') $bandwidth_rate = $tor['bandwidth_rate'] $tor_type = $tor['type'] -- cgit v1.2.3 From 367f1402ddb23f50c9b47d8f35bef31ac83fcd81 Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 22 Oct 2013 13:38:02 +0200 Subject: site_tor: can't convert String into Integer (Bug #3974) tor.contacts has been a string, and is now an array of email addresses this change needed to be adopted also in stdlib/lib/puppet/parser/functions/obfuscate_email.rb (see #4193). --- puppet/modules/site_tor/manifests/init.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'puppet/modules/site_tor') diff --git a/puppet/modules/site_tor/manifests/init.pp b/puppet/modules/site_tor/manifests/init.pp index 16ee4c30..b6e73a23 100644 --- a/puppet/modules/site_tor/manifests/init.pp +++ b/puppet/modules/site_tor/manifests/init.pp @@ -1,12 +1,12 @@ class site_tor { tag 'leap_service' Class['site_config::default'] -> Class['site_tor'] - + $tor = hiera('tor') $bandwidth_rate = $tor['bandwidth_rate'] $tor_type = $tor['type'] $nickname = $tor['nickname'] - $contact_email = $tor['contacts'] + $contact_emails = join($tor['contacts'],', ') $address = hiera('ip_address') @@ -14,7 +14,7 @@ class site_tor { tor::daemon::relay { $nickname: port => 9001, address => $address, - contact_info => obfuscate_email($contact_email), + contact_info => obfuscate_email($contact_emails), bandwidth_rate => $bandwidth_rate, my_family => '$2A431444756B0E7228A7918C85A8DACFF7E3B050', } -- cgit v1.2.3 From 8d6b36eff5fcdd39bf1065eb481a0f98a6135696 Mon Sep 17 00:00:00 2001 From: irregulator Date: Wed, 12 Mar 2014 03:20:54 +0200 Subject: DirPortFrontPage serves a static webpage only when Tor node is exit. See leap.se/code/issues/5241 --- puppet/modules/site_tor/manifests/init.pp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'puppet/modules/site_tor') diff --git a/puppet/modules/site_tor/manifests/init.pp b/puppet/modules/site_tor/manifests/init.pp index b6e73a23..28bc5240 100644 --- a/puppet/modules/site_tor/manifests/init.pp +++ b/puppet/modules/site_tor/manifests/init.pp @@ -19,12 +19,17 @@ class site_tor { my_family => '$2A431444756B0E7228A7918C85A8DACFF7E3B050', } - tor::daemon::directory { $::hostname: port => 80 } - - include site_shorewall::tor - - if ( $tor_type != 'exit' ) { + if ( $tor_type == 'exit'){ + tor::daemon::directory { $::hostname: port => 80 } + } + else { + tor::daemon::directory { $::hostname: + port => 80, + port_front_page => ''; + } include site_tor::disable_exit } + include site_shorewall::tor + } -- cgit v1.2.3 From 507391adf853ea39daac4772143fc5aa4abef47b Mon Sep 17 00:00:00 2001 From: irregulator Date: Wed, 12 Mar 2014 04:16:17 +0200 Subject: Indentation fix. --- puppet/modules/site_tor/manifests/init.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'puppet/modules/site_tor') diff --git a/puppet/modules/site_tor/manifests/init.pp b/puppet/modules/site_tor/manifests/init.pp index 28bc5240..02368a0e 100644 --- a/puppet/modules/site_tor/manifests/init.pp +++ b/puppet/modules/site_tor/manifests/init.pp @@ -24,7 +24,7 @@ class site_tor { } else { tor::daemon::directory { $::hostname: - port => 80, + port => 80, port_front_page => ''; } include site_tor::disable_exit -- cgit v1.2.3