Merge branch 'master' of ssh://labs.riseup.net/shared-tor

Conflicts:
	manifests/daemon.pp

1 files changed, 6 insertions, 40 deletions

diff --git a/manifests/polipo.pp b/manifests/polipo.pp
index 73eaea2..73dc226 100644
--- a/manifests/polipo.pp
+++ b/manifests/polipo.pp
@@ -1,43 +1,9 @@
-class tor::polipo inherits tor {
+# manage the polipo proxy service
+class tor::polipo {
+  include ::tor
 
-  package { "privoxy":
-    ensure => absent,
+  case $::operatingsystem {
+    'debian': { include tor::polipo::debian }
+    default:  { include tor::polipo::base   }
   }
-
-  package { "polipo":
-    ensure => installed,
-  }
-
-  service { "polipo":
-    ensure  => running,
-    require => [ Package["polipo"], Service["tor"] ],
-  }
-
-  file { "/etc/polipo":
-    ensure => directory,
-    owner  => root,
-    group  => root,
-    mode   => 0755,
-  }
-
-  file { "/etc/polipo/config":
-    ensure  => present,
-    owner   => root,
-    group   => root,
-    mode    => 0644,
-    source  => "puppet:///modules/tor/polipo.conf",
-    notify  => Service["polipo"],
-    require => File["/etc/polipo"],
-  }
-
-  # 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,
-    source  => "puppet:///modules/tor/polipo.cron",
-  }
-
 }