diff options
| author | intrigeri <intrigeri@boum.org> | 2012-11-09 21:27:54 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2012-11-09 21:27:54 +0100 |
| commit | 1339f9a561a80f060f9d7f9deaed7c3f54b40847 (patch) | |
| tree | 9037201abcd710de4fa2c76d97aa4fb97901f349 | |
| parent | a7c8b004e1239b2bef366cbd33a0596b20971ff9 (diff) | |
| parent | 0648f9e4440053786f06f98eca00eecae5e1e53a (diff) | |
| download | puppet-tor-1339f9a561a80f060f9d7f9deaed7c3f54b40847.tar.gz puppet-tor-1339f9a561a80f060f9d7f9deaed7c3f54b40847.tar.bz2 | |
Merge remote-tracking branch 'immerda/master'
Conflicts:
manifests/init.pp
manifests/polipo.pp
manifests/polipo/base.pp
manifests/torsocks.pp
| -rw-r--r-- | manifests/polipo.pp | 2 | ||||
| -rw-r--r-- | manifests/polipo/base.pp | 4 | ||||
| -rw-r--r-- | manifests/torsocks.pp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/manifests/polipo.pp b/manifests/polipo.pp index a7ef005..8563347 100644 --- a/manifests/polipo.pp +++ b/manifests/polipo.pp @@ -1,7 +1,7 @@ class tor::polipo { include ::tor - case $operatingsystem { + case $::operatingsystem { 'debian': { include tor::polipo::debian } default: { include tor::polipo::base } } diff --git a/manifests/polipo/base.pp b/manifests/polipo/base.pp index f485747..fca4b21 100644 --- a/manifests/polipo/base.pp +++ b/manifests/polipo/base.pp @@ -1,6 +1,6 @@ class tor::polipo::base { - package { "polipo": - ensure => installed, + package{'polipo': + ensure => present, } file { "/etc/polipo/config": diff --git a/manifests/torsocks.pp b/manifests/torsocks.pp index 6346707..7bb51ee 100644 --- a/manifests/torsocks.pp +++ b/manifests/torsocks.pp @@ -1,5 +1,5 @@ class tor::torsocks { - if !$torsocks_ensure_version { $torsocks_ensure_version = 'installed'} + if !$torsocks_ensure_version { $torsocks_ensure_version = 'installed' } include ::tor package{'torsocks': ensure => $torsocks_ensure_version, |