From: intrigeri <intrigeri@boum.org>
Date: Fri, 9 Nov 2012 20:27:54 +0000 (+0100)
Subject: Merge remote-tracking branch 'immerda/master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=1339f9a561a80f060f9d7f9deaed7c3f54b40847;p=puppet-tor.git

Merge remote-tracking branch 'immerda/master'

Conflicts:
	manifests/init.pp
	manifests/polipo.pp
	manifests/polipo/base.pp
	manifests/torsocks.pp
---

1339f9a561a80f060f9d7f9deaed7c3f54b40847
diff --cc manifests/torsocks.pp
index 6346707,e3221c9..7bb51ee
--- a/manifests/torsocks.pp
+++ b/manifests/torsocks.pp
@@@ -1,7 -1,6 +1,7 @@@
  class tor::torsocks {
-   if !$torsocks_ensure_version { $torsocks_ensure_version = 'installed'}
++  if !$torsocks_ensure_version { $torsocks_ensure_version = 'installed' }
    include ::tor
    package{'torsocks':
 -    ensure => present,
 +    ensure => $torsocks_ensure_version,
    }
  }