aboutsummaryrefslogtreecommitdiff
path: root/manifests/nodo.pp
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-01-26 15:29:56 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-01-26 15:29:56 -0200
commit0cff2c8111f03221f041bf86684937efb8867fe4 (patch)
tree57a4a73592a2efec98b1745d1969802d80b8c5c1 /manifests/nodo.pp
parentf24585f59eedc3159a3e566edd4828093b084f77 (diff)
downloadpuppet-nodo-0cff2c8111f03221f041bf86684937efb8867fe4.tar.gz
puppet-nodo-0cff2c8111f03221f041bf86684937efb8867fe4.tar.bz2
Make custom_key_dir a class parameter and not a global variable; misc database updates; adding default exec and fileserver config
Diffstat (limited to 'manifests/nodo.pp')
-rw-r--r--manifests/nodo.pp3
1 files changed, 2 insertions, 1 deletions
diff --git a/manifests/nodo.pp b/manifests/nodo.pp
index af7251f..43d6d4f 100644
--- a/manifests/nodo.pp
+++ b/manifests/nodo.pp
@@ -60,8 +60,9 @@ class nodo {
# Apt configuration
if $use_apt != false {
class { 'apt':
- include_src => hiera('nodo::apt_include_src', false),
+ include_src => hiera('nodo::apt_include_src', false),
use_next_release => hiera('nodo::apt_use_next_release', false),
+ custom_key_dir => hiera('nodo::apt_custom_key_dir', 'puppet:///modules/site_apt/keys.d')
}
include apt::unattended_upgrades