diff options
| author | Micah <micah@riseup.net> | 2015-03-27 18:50:01 +0000 |
|---|---|---|
| committer | Micah <micah@riseup.net> | 2015-03-27 18:50:01 +0000 |
| commit | 3925f36f7cd0f15029304363b0f5749750627c96 (patch) | |
| tree | 5613a76af8c008a5820e41c097ed94f231412956 /files | |
| parent | a31579095231c68a2786955b9149d3bcd13400af (diff) | |
| parent | 19a44ce97f59633002d844e2b37f2b26b2f1cfbc (diff) | |
| download | puppet-tor-3925f36f7cd0f15029304363b0f5749750627c96.tar.gz puppet-tor-3925f36f7cd0f15029304363b0f5749750627c96.tar.bz2 | |
Merge branch 'improvements' into 'master'
Improvements
These are a bunch of improvements I got on my github profile in the past.
Interested in merging them?
Summary:
* adds tor repo management
* removes a workaround for a fixed bug
* adds tor-arm support
* support for safe logging
* puppet 3 ready templates.
It's merged on top of the current master.
See merge request !1
Diffstat (limited to 'files')
| -rwxr-xr-x | files/polipo/polipo.cron | 22 |
1 files changed, 0 insertions, 22 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") |