diff options
author | Micah Anderson <micah@riseup.net> | 2013-06-25 12:24:43 -0400 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2013-06-25 12:24:43 -0400 |
commit | 6aea5c1d17cf4dd1800aba4409fdc25c54936a83 (patch) | |
tree | 21a0c209070bea164c27f81618212c613d169f54 | |
parent | ad48e4616e438c94122b144009f54651408387aa (diff) | |
parent | 8579e89110c3df333ec3bb63154bba2c57a848a9 (diff) |
Merge remote-tracking branch 'leap/develop' into develop
-rw-r--r-- | puppet/manifests/setup.pp | 4 |
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 |