summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-06-25 18:12:46 +0200
committervarac <varacanero@zeromail.org>2013-06-25 18:12:46 +0200
commit8579e89110c3df333ec3bb63154bba2c57a848a9 (patch)
tree3f67a5b7ff3f2497c9fe17ac3e93bc6471bb680d /puppet
parent9e3a9e6cf677a5f840e496c11e98c24399588973 (diff)
include global variable for apt config, include Exec[] defaults
Diffstat (limited to 'puppet')
-rw-r--r--puppet/manifests/setup.pp4
1 files changed, 4 insertions, 0 deletions
diff --git a/puppet/manifests/setup.pp b/puppet/manifests/setup.pp
index 6adb1948..112782d8 100644
--- a/puppet/manifests/setup.pp
+++ b/puppet/manifests/setup.pp
@@ -2,6 +2,10 @@
# this is applied before each run of site.pp
#
$services = ''
+
+Exec { path => '/usr/bin:/usr/sbin/:/bin:/sbin:/usr/local/bin:/usr/local/sbin' }
+$custom_key_dir = 'puppet:///modules/site_apt/keys'
+
include site_config::hosts
include site_apt