From 172ad4bc7dd5b82629bfa776ec4164f902569fdb Mon Sep 17 00:00:00 2001
From: guido <guido@bruo.org>
Date: Tue, 2 Dec 2014 11:40:04 -0300
Subject: Use $hostname to locate tor.key. Fixes #6478

Change-Id: Ibbe3687d5a773b444f6e9145bf235aaeea637e1d
---
 puppet/modules/site_webapp/manifests/hidden_service.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'puppet')

diff --git a/puppet/modules/site_webapp/manifests/hidden_service.pp b/puppet/modules/site_webapp/manifests/hidden_service.pp
index ac0e8a37..16b6e2e7 100644
--- a/puppet/modules/site_webapp/manifests/hidden_service.pp
+++ b/puppet/modules/site_webapp/manifests/hidden_service.pp
@@ -21,7 +21,7 @@ class site_webapp::hidden_service {
 
     '/var/lib/tor/webapp/private_key':
       ensure  => present,
-      source  => '/srv/leap/files/nodes/web/tor.key',
+      source  => "/srv/leap/files/nodes/${::hostname}/tor.key",
       owner   => 'debian-tor',
       group   => 'debian-tor',
       mode    => '0600';
-- 
cgit v1.2.3


From 8578cf78aca62636cd80bf1302d2946f2d62dbfe Mon Sep 17 00:00:00 2001
From: guido <guido@bruo.org>
Date: Tue, 2 Dec 2014 11:41:46 -0300
Subject: Use include to avoid redeclaration of class { 'tor::daemon': }. Fixes
 #6479

Change-Id: Ibd1b1eef7afca10cf2a2d56a24e703636d6a52c6
---
 puppet/modules/site_tor/manifests/init.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'puppet')

diff --git a/puppet/modules/site_tor/manifests/init.pp b/puppet/modules/site_tor/manifests/init.pp
index d14e813d..80ccc5d3 100644
--- a/puppet/modules/site_tor/manifests/init.pp
+++ b/puppet/modules/site_tor/manifests/init.pp
@@ -18,8 +18,8 @@ class site_tor {
   else {
     $openvpn_ports = []
   }
-  
-  class { 'tor::daemon': }
+
+  include tor::daemon
   tor::daemon::relay { $nickname:
     port           => 9001,
     address        => $address,
-- 
cgit v1.2.3