summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah <micah@leap.se>2016-06-23 12:05:29 -0400
committerMicah <micah@leap.se>2016-08-25 15:07:39 -0400
commitf0e3e302ac6235c5c3c881983926f58084f211e8 (patch)
tree1e7966c8ebbb77f197c0696e37cb6b5cfb5241f8
parentc8bd240e26fea7cd97a0fc44a9ca6e1d12389b7f (diff)
Stop tor from restarting on every deploy (#8211).
We were creating the hidden service name without a newline, and then tor would be restarted and change the hidden service hostname file to have a newline, which would then require that the next deploy would change that file to not have a newline again. This fixes that problem by making the hostname have a newline so it matches what tor wants. Change-Id: I38f450684d557cf943ec94f2f8e19cda3aefdf66
-rw-r--r--puppet/modules/site_webapp/manifests/hidden_service.pp2
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/modules/site_webapp/manifests/hidden_service.pp b/puppet/modules/site_webapp/manifests/hidden_service.pp
index ad97eeb7..0aac6038 100644
--- a/puppet/modules/site_webapp/manifests/hidden_service.pp
+++ b/puppet/modules/site_webapp/manifests/hidden_service.pp
@@ -29,7 +29,7 @@ class site_webapp::hidden_service {
'/var/lib/tor/webapp/hostname':
ensure => present,
- content => $tor_domain,
+ content => "${tor_domain}\n",
owner => 'debian-tor',
group => 'debian-tor',
mode => '0600',