From d08f07eae13d02431b1c4142634f49e978b551de Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Sun, 4 Sep 2016 21:00:45 +0200
Subject: make module also work on EL7

* user is different
* user must not be managed
* make access more safe, it doesn't make sense that the user running
  the daemon owns the config, nor the config directory.
---
 manifests/base.pp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'manifests/base.pp')

diff --git a/manifests/base.pp b/manifests/base.pp
index b98451b..31b9edb 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -1,8 +1,15 @@
 # basic management of resources for tor
 class tor::base {
-  package { [ 'tor', 'tor-geoipdb' ]:
+  package {'tor':
     ensure => $tor::ensure_version,
   }
+  case $osfamily {
+    'Debian': {
+      package {'tor-geoipdb':
+        ensure => $tor::ensure_version,
+      }
+    }
+  }
 
   service { 'tor':
     ensure     => running,
-- 
cgit v1.2.3


From 9899d19553f55fce8ff6f6d790945777a298bacf Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Sat, 5 Nov 2016 13:48:01 +0100
Subject: simplify the version requirement, as we don't need to pass that
 parameter along

---
 manifests/base.pp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'manifests/base.pp')

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'],
       }
     }
   }
-- 
cgit v1.2.3