summaryrefslogtreecommitdiff
path: root/puppet/manifests/setup.pp
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 /puppet/manifests/setup.pp
parent89ad90073b5289da62eed74c8794e2911672081f (diff)
parent4b5b54d031344aa7a7b86254c820e391a4d4d762 (diff)
Merge branch 'bug/2984' into develop
Diffstat (limited to 'puppet/manifests/setup.pp')
-rw-r--r--puppet/manifests/setup.pp1
1 files changed, 0 insertions, 1 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