Fix: merge nodo::utils::tor into nodo::utils::network::tor

diff --git a/manifests/role/tor.pp b/manifests/role/tor.pp
index 07ae5a0f9202c2f3d45a6b5c8342b4b95e558b1e..cf6dc3063fdbc6027e0bbf05154fc3b8789b219a 100644 (file)
--- a/manifests/role/tor.pp
+++ b/manifests/role/tor.pp
@@ -1,4 +1,4 @@
 class nodo::role::tor inherits nodo::base::virtual {
   include tor::daemon
-  include nodo::utils::tor
+  include nodo::utils::network::tor
 }

diff --git a/manifests/utils/network/tor.pp b/manifests/utils/network/tor.pp
index 88c29ce1d7e29bd2e1dbf10b5a8b72c97144b93d..78b08a41c7eeb1fba4f507bb447e66f410213bf3 100644 (file)
--- a/manifests/utils/network/tor.pp
+++ b/manifests/utils/network/tor.pp
@@ -1,6 +1,8 @@
-# This class currently only manages the repository definition and key
+# This class currently mostly manages the repository definition and key
 # Use the "tor" or "onion" modules to manage package installation and service configuration
-class nodo::utils::network::tor {
+class nodo::utils::network::tor (
+  $ensure = 'installed',
+) {
   nodo::subsystem::apt::repo { 'torproject.org':
     definition => "deb [signed-by=/etc/apt/trusted.gpg.d/torproject.org.gpg] https://deb.torproject.org/torproject.org ${::lsbdistcodename} main",
     key_source => 'puppet:///modules/nodo/etc/apt/trusted.gpg.d/torproject.org.gpg',
@@ -10,4 +12,10 @@ class nodo::utils::network::tor {
     ensure  => present,
     require => Nodo::Subsystem::Apt::Repo['torproject.org'],
   }
+
+  package { [
+    'tor-arm',
+  ]:
+    ensure => $ensure,
+  }
 }

diff --git a/manifests/utils/tor.pp b/manifests/utils/tor.pp
deleted file mode 100644 (file)
index e229009..0000000
--- a/manifests/utils/tor.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-class nodo::utils::tor (
-  $ensure = 'installed',
-) {
-  package { [
-    'tor-arm',
-  ]:
-    ensure => $ensure,
-  }
-}