summaryrefslogtreecommitdiff
path: root/puppet/manifests/setup.pp
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-06-27 12:01:52 -0400
committerMicah Anderson <micah@riseup.net>2013-06-27 12:01:52 -0400
commit4a102a1e9c856cb4df787f0aaa80747d4cdaa0c7 (patch)
tree89382414c3bb83a8cd9ee74245f4eeee678bb4ce /puppet/manifests/setup.pp
parent157fb1237d66c4eae83fa2c685745da9e20bca72 (diff)
parent63914c68537a7e05a214c6d943389c80074a0915 (diff)
Merge branch 'develop' into leap
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