summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrebs <drebs@riseup.net>2012-01-08 03:27:20 -0200
committerdrebs <drebs@riseup.net>2012-01-08 03:27:20 -0200
commit09d2c7140795012a46e55af024bf0503a32b2751 (patch)
treed88289322ee62d5277a274cb8095cbdbbc306da5
parent2509c29d11b37681e7d0f1b4f68a31c986e53eef (diff)
fixing template and dependencies
-rw-r--r--manifests/init.pp3
-rw-r--r--templates/torrc.erb2
2 files changed, 3 insertions, 2 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index c585489..a3f12fd 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -10,6 +10,7 @@ class tor {
package { [ "tor", "torsocks" ]:
ensure => installed,
+ require => File["/var/tor"],
}
group { "debian-tor":
@@ -25,7 +26,7 @@ class tor {
home => "/var/tor",
shell => "/bin/sh",
gid => "debian-tor",
- require => Group["debian-tor"],
+ require => Group["debian-tor"],
}
file { "/var/tor":
diff --git a/templates/torrc.erb b/templates/torrc.erb
index 2112931..04db56f 100644
--- a/templates/torrc.erb
+++ b/templates/torrc.erb
@@ -23,7 +23,7 @@ RunAsDaemon 1
DataDirectory <%= data_directory %>
## tor controller
-<%- if control_port != 0 then -%>
+<%- if control_port != '0' then -%>
ControlPort <%= control_port %>
HashedControlPassword <%= hashed_control_password %>
<%- end -%>