aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah <micah@riseup.net>2015-02-28 16:07:45 +0000
committerMicah <micah@riseup.net>2015-02-28 16:07:45 +0000
commitbb12a296a001a6b11377385b2dd40d39f6534703 (patch)
treef8f1f9a355a00edf5716adc61484c255c013902f
parent31f8661eea49b05f32ccca4ad3d628548ba54b77 (diff)
parent3bd6f73973f0a4b744f75d3a9b2c73b15e76603b (diff)
downloadpuppet-apt-bb12a296a001a6b11377385b2dd40d39f6534703.tar.gz
puppet-apt-bb12a296a001a6b11377385b2dd40d39f6534703.tar.bz2
Merge branch 'fix-usage-of-module_dir' into 'master'
Fix usage of module_dir I didn't test enough functionality before merging https://gitlab.com/shared-puppet-modules-group/apt/merge_requests/4 apparently: anything that depends on module_dir is currently broken. Sorry! See merge request !5
-rw-r--r--manifests/init.pp1
1 files changed, 1 insertions, 0 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 0fb4f1b..68856cc 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -113,6 +113,7 @@ class apt(
# backports uses the normal archive key now
package { 'debian-backports-keyring': ensure => absent }
+ include common::moduledir
common::module_dir { 'apt': }
$apt_base_dir = "${common::moduledir::module_dir_path}/apt"