aboutsummaryrefslogtreecommitdiff
path: root/manifests/daemon.pp
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2012-01-08 20:53:05 -0200
committerSilvio Rhatto <rhatto@riseup.net>2012-01-08 20:53:05 -0200
commit93a35a6a7ac15a93cd1b4929acdaf61f11b96674 (patch)
treedf8e928246524f0f98bfd4e546e2a267449f1c1f /manifests/daemon.pp
parent34b2d73c64678ee9004ff1ee042448c8a445fef8 (diff)
downloadpuppet-tor-93a35a6a7ac15a93cd1b4929acdaf61f11b96674.tar.gz
puppet-tor-93a35a6a7ac15a93cd1b4929acdaf61f11b96674.tar.bz2
Renaming polipo to tor::polipo class and sorting out defines
Diffstat (limited to 'manifests/daemon.pp')
-rw-r--r--manifests/daemon.pp30
1 files changed, 25 insertions, 5 deletions
diff --git a/manifests/daemon.pp b/manifests/daemon.pp
index d8a18e8..7b28cd4 100644
--- a/manifests/daemon.pp
+++ b/manifests/daemon.pp
@@ -1,10 +1,30 @@
-class tor::daemon inherits tor {
+class tor::daemon inherits tor::polipo {
- include polipo
+ group { "debian-tor":
+ ensure => present,
+ allowdupe => false,
+ }
+
+ Package[ "tor", "torsocks" ] {
+ require => File["/var/tor"],
+ }
+
+ user { "debian-tor":
+ allowdupe => false,
+ comment => "tor user,,,",
+ ensure => present,
+ home => "/var/tor",
+ shell => "/bin/sh",
+ gid => "debian-tor",
+ require => Group["debian-tor"],
+ }
- service { "tor":
- ensure => running,
- require => [ Package['tor'], Service["polipo"] ],
+ file { "/var/tor":
+ ensure => directory,
+ mode => 0755,
+ owner => debian-tor,
+ group => debian-tor,
+ require => User["debian-tor"],
}
define config( $socks_port = 9050,