completing default relay config

diff --git a/manifests/daemon.pp b/manifests/daemon.pp
index d05f94f9d2b61f20fa306e3d23513ff1748f7095..037171b0d5642d629b01b6c4a1ab7440e078dba1 100644 (file)
--- a/manifests/daemon.pp
+++ b/manifests/daemon.pp
@@ -7,7 +7,7 @@ class tor::daemon inherits tor {
     require => [ Package['tor'], Service["polipo"] ],
   }
 
-  define config( $socks_port = 9001,
+  define config( $socks_port = 9050,
                  $socks_listen_addresses = [ '127.0.0.1' ],
                  $socks_policies = [ 'accept 127.0.0.1/16', 'reject *' ],
                  $log_rules = [ 'notice file /var/log/tor/notices.log' ],

diff --git a/manifests/init.pp b/manifests/init.pp
index bf4f6962c0f2399ea7465488365451b011209601..c5854894e0c5aba9e3b174fd86b23f27b447d440 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -8,7 +8,31 @@ class tor {
     ensure => absent,
   }
 
-  package { [ "tor", "polipo", "torsocks" ]:
+  package { [ "tor", "torsocks" ]:
     ensure => installed,
   }
+
+  group { "debian-tor":
+    ensure    => present,
+    allowdupe => false,
+    require   => Package["tor"],
+  }
+
+  user { "debian-tor":
+    allowdupe => false,
+    comment   => "tor user,,,",
+    ensure    => present,
+    home      => "/var/tor",
+    shell     => "/bin/sh",
+    gid       => "debian-tor",
+    require   => Group["debian-tor"],
+  }
+
+  file { "/var/tor":
+    ensure  => directory,
+    mode    => 0755,
+    owner   => debian-tor,
+    group   => debian-tor,
+    require => User["debian-tor"],
+  }
 }

diff --git a/manifests/polipo.pp b/manifests/polipo.pp
index 7509563cb7dd4808338e841963f6922004ec1efd..d7b1caa1f0531e01e24eb72ec2d8760e332f8dc5 100644 (file)
--- a/manifests/polipo.pp
+++ b/manifests/polipo.pp
@@ -1,5 +1,9 @@
 class polipo {
 
+  package { "polipo":
+    ensure => installed,
+  }
+
   service { "polipo":
     ensure  => running,
     require => Package["polipo"],

diff --git a/manifests/relay.pp b/manifests/relay.pp
index fb2bf18aab95baaffa3c90fa695be936180a9af4..b57bc8d94224977bcdb42c058f97290e045f1d46 100644 (file)
--- a/manifests/relay.pp
+++ b/manifests/relay.pp
@@ -1,6 +1,6 @@
 class tor::relay inherits tor::daemon {
 
-  tor::daemon::config { "tor-relay-$name":
+  tor::daemon::config { "tor-relay":
                         socks_port             => 0,
                         socks_listen_addresses => [],
                         or_port                => 9001,