diff options
| author | intrigeri <intrigeri@boum.org> | 2012-03-14 20:36:22 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2012-03-14 20:36:22 +0100 |
| commit | 7bf57976706f73881d18bbaea0e7f87b7f1c3b40 (patch) | |
| tree | 38af3a1f768f4b6501d0fb91d3f788ce92fb1a9a /manifests/init.pp | |
| parent | 510e81d04bdfa15dadb272431fbe78d320d3fc68 (diff) | |
| parent | e1d9f793aa356982b017ed197e19f4cdbb84cb83 (diff) | |
Merge remote-tracking branch 'riseup/master'
Diffstat (limited to 'manifests/init.pp')
| -rw-r--r-- | manifests/init.pp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index a998d48..0c38073 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,11 +1,16 @@ class tor { if !$tor_ensure_version { $tor_ensure_version = 'installed' } - - package { [ "tor", "tor-geoip", "torsocks" ]: + if !$torsocks_ensure_version { $torsocks_ensure_version = 'installed'} + + package { [ "tor", "tor-geoipdb" ]: ensure => $tor_ensure_version, } + package { "torsocks": + ensure => $torsocks_ensure_version, + } + service { 'tor': ensure => running, enable => true, |