From 19a44ce97f59633002d844e2b37f2b26b2f1cfbc Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Sat, 30 Aug 2014 16:37:58 +0200
Subject: bug is fixed

---
 files/polipo/polipo.cron   | 22 ----------------------
 manifests/polipo/debian.pp | 11 -----------
 2 files changed, 33 deletions(-)
 delete mode 100755 files/polipo/polipo.cron

diff --git a/files/polipo/polipo.cron b/files/polipo/polipo.cron
deleted file mode 100755
index aba88bc..0000000
--- a/files/polipo/polipo.cron
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh        
-set -e
-
-FORBIDDEN_FILE=/etc/polipo/forbidden
-CONFIG_FILE=/etc/polipo/config
-
-if [ ! -x /usr/bin/polipo ]; then
-  exit 0
-fi
-
-if [ ! -f $FORBIDDEN_FILE ]; then
-  FORBIDDEN_FILE=/dev/null
-fi  
-
-PIDFILE=/var/run/polipo/polipo.pid
-[ -f "$PIDFILE" ] && kill -USR1 $(cat "$PIDFILE")
-# TODO: remove redirect stderr to /dev/null after the following bug is solved:
-# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=580434
-su -c \
-	"nice polipo -x -c $CONFIG_FILE forbiddenFile=$FORBIDDEN_FILE > /dev/null" \
-	proxy &> /dev/null
-[ -f "$PIDFILE" ] && kill -USR2 $(cat "$PIDFILE")
diff --git a/manifests/polipo/debian.pp b/manifests/polipo/debian.pp
index 5ca6922..607b361 100644
--- a/manifests/polipo/debian.pp
+++ b/manifests/polipo/debian.pp
@@ -1,16 +1,5 @@
 # manage polipo on debian
 class tor::polipo::debian inherits tor::polipo::base {
-  # 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/polipo.cron',
-  }
-
   Service['polipo'] {
     hasstatus => false,
     pattern   => '/usr/bin/polipo',
-- 
cgit v1.2.3