summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-06-27 12:00:03 -0400
committerMicah Anderson <micah@riseup.net>2013-06-27 12:00:03 -0400
commit63914c68537a7e05a214c6d943389c80074a0915 (patch)
tree3970880938ef7f1e628efc023e0350838db3376d
parent89ad90073b5289da62eed74c8794e2911672081f (diff)
parent4b5b54d031344aa7a7b86254c820e391a4d4d762 (diff)
Merge branch 'bug/2984' into develop
-rw-r--r--puppet/manifests/setup.pp1
-rw-r--r--puppet/manifests/site.pp2
m---------puppet/modules/apt0
-rw-r--r--puppet/modules/site_apt/manifests/init.pp5
4 files changed, 4 insertions, 4 deletions
diff --git a/puppet/manifests/setup.pp b/puppet/manifests/setup.pp
index 112782d8..80e7ffc2 100644
--- a/puppet/manifests/setup.pp
+++ b/puppet/manifests/setup.pp
@@ -4,7 +4,6 @@
$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
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index f0319bc2..08cbbb9e 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -1,8 +1,6 @@
# set a default exec path
Exec { path => '/usr/bin:/usr/sbin/:/bin:/sbin:/usr/local/bin:/usr/local/sbin' }
-$custom_key_dir = 'puppet:///modules/site_apt/keys'
-
# parse services for host
$services=join(hiera_array('services'), ' ')
notice("Services for ${fqdn}: ${services}")
diff --git a/puppet/modules/apt b/puppet/modules/apt
-Subproject f11e3d475345059220402a44a97da491c85d2b5
+Subproject 1a72a99693c1d77bfe891546408f88264fca98e
diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp
index 0da7f3be..8821c110 100644
--- a/puppet/modules/site_apt/manifests/init.pp
+++ b/puppet/modules/site_apt/manifests/init.pp
@@ -8,7 +8,10 @@ class site_apt {
} else {
$custom_preferences = ''
}
- class {'apt': custom_preferences => $custom_preferences }
+ class { 'apt':
+ custom_preferences => $custom_preferences,
+ custom_key_dir => 'puppet:///modules/site_apt/keys'
+ }
# enable http://deb.leap.se debian package repository
include site_apt::leap_repo