fixing template and dependencies

diff --git a/manifests/init.pp b/manifests/init.pp
index c5854894e0c5aba9e3b174fd86b23f27b447d440..a3f12fd914e279ee223d1624dfd47e3fd35a08e4 100644 (file)
--- 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 21129310aa8fd1be425ee5d0df9c345e0b551dc1..04db56f41dcc35ae0d0f77d2de1ffd9417857dce 100644 (file)
--- 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 -%>