diff options
| author | mh <mh@immerda.ch> | 2016-11-05 13:48:01 +0100 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2016-11-05 13:48:01 +0100 |
| commit | 9899d19553f55fce8ff6f6d790945777a298bacf (patch) | |
| tree | ecb6e06a0212240163c4eb42b5b228387f358901 | |
| parent | d17494c600a59206601e4dfd0731b6af36b59631 (diff) | |
simplify the version requirement, as we don't need to pass that parameter along
| -rw-r--r-- | manifests/base.pp | 5 | ||||
| -rw-r--r-- | manifests/daemon.pp | 10 | ||||
| -rw-r--r-- | manifests/init.pp | 2 |
3 files changed, 7 insertions, 10 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index 31b9edb..b5aa7e9 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -1,12 +1,13 @@ # basic management of resources for tor class tor::base { package {'tor': - ensure => $tor::ensure_version, + ensure => $tor::version, } case $osfamily { 'Debian': { package {'tor-geoipdb': - ensure => $tor::ensure_version, + ensure => $tor::version, + before => Service['tor'], } } } diff --git a/manifests/daemon.pp b/manifests/daemon.pp index 2522b2c..55c881d 100644 --- a/manifests/daemon.pp +++ b/manifests/daemon.pp @@ -1,6 +1,5 @@ # manage a snippet based tor installation class tor::daemon ( - $ensure_version = 'installed', $use_munin = false, $data_dir = '/var/lib/tor', $config_file = '/etc/tor/torrc', @@ -10,13 +9,10 @@ class tor::daemon ( $safe_logging = 1, ) { - class{'tor': - ensure_version => $ensure_version, - } - - include tor::daemon::base + include ::tor + include ::tor::daemon::base if $use_munin { - include tor::munin + include ::tor::munin } } diff --git a/manifests/init.pp b/manifests/init.pp index 9c19c64..ad584aa 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,6 +1,6 @@ # manage a basic tor installation class tor ( - $ensure_version = 'installed' + $version = 'installed' ){ include tor::base } |