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 /manifests/polipo | |
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 'manifests/polipo')
-rw-r--r-- | manifests/polipo/debian.pp | 11 |
1 files changed, 0 insertions, 11 deletions
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', |