From bd7a7e46e4b0a0f59e80c232d15c86dfb734555e Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Sun, 14 Apr 2013 16:59:48 -0300 Subject: Qualifying users::admin --- manifests/base.pp | 6 ++---- manifests/subsystem/apt.pp | 2 ++ 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'manifests') diff --git a/manifests/base.pp b/manifests/base.pp index 835dfd0..700d23a 100644 --- 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 dd49413..a8f6d6c 100644 --- 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": -- cgit v1.2.3