Qualifying users::admin

diff --git a/manifests/base.pp b/manifests/base.pp
index 835dfd0d8b3c6a8390c2650f8299a2141b014f1d..700d23a38573482953e2aa7f3fc020d432212f36 100644 (file)
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -25,11 +25,9 @@ class nodo::base {
   include concat::setup
   include cron
 
-  class { '::apt::unattended_upgrades': }
-
   # Include admin accounts if you have this class
-  if defined('users:admin') {
-    include users::admin
+  if defined('::users:admin') {
+    class { '::users::admin': }
   }
 
   # Puppet daemon

diff --git a/manifests/subsystem/apt.pp b/manifests/subsystem/apt.pp
index dd4941348c1b8cc4fe2cce0451071bb92892d883..a8f6d6c866844871a8d31f3f144c832de89132c1 100644 (file)
--- a/manifests/subsystem/apt.pp
+++ b/manifests/subsystem/apt.pp
@@ -8,6 +8,8 @@ class nodo::subsystem::apt {
     custom_key_dir   => hiera('nodo::subsystem::apt::custom_key_dir',   'puppet:///modules/site_apt/keys.d')
   }
 
+  class { '::apt::unattended_upgrades': }
+
   $apt_domain_source = hiera('nodo::subsystem::apt::domain_source', false)
 
   apt::sources_list { "${::domain}.list":