diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-20 23:09:20 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-20 23:09:20 -0200 |
| commit | f252115be193d58d345b7d18228800c68a1e47aa (patch) | |
| tree | 31c95ada21d54314ecb1650f2b19e8540386dd62 /manifests/init.pp | |
| parent | 89d3242cc7d4607f5eb8f1df39985c3597ee428d (diff) | |
| parent | a780e84001177f10a86a7bf824589c0553f513a0 (diff) | |
| download | puppet-tor-f252115be193d58d345b7d18228800c68a1e47aa.tar.gz puppet-tor-f252115be193d58d345b7d18228800c68a1e47aa.tar.bz2 | |
Merge branch 'master' of ssh://labs.riseup.net/shared-tor
Conflicts:
manifests/daemon.pp
Diffstat (limited to 'manifests/init.pp')
| -rw-r--r-- | manifests/init.pp | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 0c38073..9c19c64 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,25 +1,6 @@ -class tor { - - if !$tor_ensure_version { $tor_ensure_version = 'installed' } - 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, - hasrestart => true, - hasstatus => true, - require => Package['tor'], - } - - if $use_munin { - include tor::munin - } +# manage a basic tor installation +class tor ( + $ensure_version = 'installed' +){ + include tor::base } |