aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-04-14 16:59:48 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-04-14 16:59:48 -0300
commitbd7a7e46e4b0a0f59e80c232d15c86dfb734555e (patch)
treef560b531748da77be7f3f4cc8f3f4c4eeac3e246 /manifests
parentc2da47fcc981b83c401039f0f87b742c80b0655d (diff)
downloadpuppet-nodo-bd7a7e46e4b0a0f59e80c232d15c86dfb734555e.tar.gz
puppet-nodo-bd7a7e46e4b0a0f59e80c232d15c86dfb734555e.tar.bz2
Qualifying users::admin
Diffstat (limited to 'manifests')
-rw-r--r--manifests/base.pp6
-rw-r--r--manifests/subsystem/apt.pp2
2 files changed, 4 insertions, 4 deletions
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":