diff options
author | mh <mh@immerda.ch> | 2011-10-28 16:50:30 +0200 |
---|---|---|
committer | mh <mh@immerda.ch> | 2011-10-28 16:51:58 +0200 |
commit | 8f1d1c4ef7a1298d448416997218dafb5d40166f (patch) | |
tree | 069afbe224ffeebd7d0633df9a52a0e3c039d6b3 /manifests/init.pp | |
parent | 5d2516c3a7a6b34399ff7b856fc9900ef1e41294 (diff) | |
download | puppet-tor-8f1d1c4ef7a1298d448416997218dafb5d40166f.tar.gz puppet-tor-8f1d1c4ef7a1298d448416997218dafb5d40166f.tar.bz2 |
decouple polipo and torsocks into their own subclasses, so we can for example also just install tor
Diffstat (limited to 'manifests/init.pp')
-rw-r--r-- | manifests/init.pp | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 8b78f65..5d1c3d8 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,5 +1,5 @@ class tor { - package { [ "tor", "polipo", "torsocks" ]: + package {'tor': ensure => installed, } @@ -8,31 +8,4 @@ class tor { enable => true, require => Package['tor'], } - - service { "polipo": - ensure => running, - enable => true, - } - - file { "/etc/polipo/config": - ensure => present, - owner => root, - group => root, - mode => 0644, - source => "puppet:///modules/tor/polipo.conf", - require => Package["polipo"], - notify => Service["polipo"], - before => Service["tor"], - } - - # TODO: restore file to original state after the following bug is solved: - # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=580434 - file { "/etc/cron.daily/polipo": - ensure => present, - owner => root, - group => root, - mode => 0755, - require => Package["polipo"], - source => "puppet:///modules/tor/polipo.cron", - } } |