decouple polipo and torsocks into their own subclasses, so we can for example also just install tor

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",
-  }
 }