diff options
| author | Micah Anderson <micah@leap.se> | 2014-12-02 11:27:56 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2014-12-02 11:27:56 -0500 |
| commit | 09aee27fa2546b0e95c44af87e54db7ec6747ebb (patch) | |
| tree | 00f9366db21f0c05d7785abee37c9ff637d7192c | |
| parent | a3af7019efe6f5ff3daeeff474a8c31b1b3318c8 (diff) | |
| parent | 8578cf78aca62636cd80bf1302d2946f2d62dbfe (diff) | |
Merge remote-tracking branch 'gerrit/develop' into develop
Change-Id: I2fa85918af8199fbc41bb4e58dae6c78911ab626
| -rw-r--r-- | puppet/modules/site_tor/manifests/init.pp | 4 | ||||
| -rw-r--r-- | puppet/modules/site_webapp/manifests/hidden_service.pp | 2 |
2 files changed, 3 insertions, 3 deletions
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, 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'; |