diff options
| author | mh <mh@immerda.ch> | 2014-08-30 16:37:58 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2014-08-30 16:37:58 +0200 |
| commit | 19a44ce97f59633002d844e2b37f2b26b2f1cfbc (patch) | |
| tree | 5613a76af8c008a5820e41c097ed94f231412956 | |
| parent | bf6ff32f063cf70b69a61fc35ee840e2f9b34119 (diff) | |
| download | puppet-tor-19a44ce97f59633002d844e2b37f2b26b2f1cfbc.tar.gz puppet-tor-19a44ce97f59633002d844e2b37f2b26b2f1cfbc.tar.bz2 | |
bug is fixed
| -rwxr-xr-x | files/polipo/polipo.cron | 22 | ||||
| -rw-r--r-- | manifests/polipo/debian.pp | 11 |
2 files changed, 0 insertions, 33 deletions
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', |