Merge branch 'develop'

2 files changed, 22 insertions, 0 deletions

diff --git a/puppet/modules/apt b/puppet/modules/apt
deleted file mode 160000
-Subproject 33c61e8df59db1abbed379a9e9790946060a8f1
diff --git a/puppet/modules/apt/manifests/params.pp b/puppet/modules/apt/manifests/params.pp
new file mode 100644
index 00000000..28af06eb
--- /dev/null
+++ b/puppet/modules/apt/manifests/params.pp
@@ -0,0 +1,22 @@
+class apt::params () {
+  $use_lts = false
+  $use_volatile = false
+  $use_backports = true
+  $include_src = false
+  $use_next_release = false
+  $debian_url = 'http://httpredir.debian.org/debian/'
+  $security_url = 'http://security.debian.org/'
+  $ubuntu_url = 'http://archive.ubuntu.com/ubuntu'
+  $backports_url = $::debian_codename ? {
+    'squeeze'  => 'http://backports.debian.org/debian-backports/',
+    default => $::operatingsystem ? {
+      'Ubuntu' => $ubuntu_url,
+      default  => $debian_url,
+    }
+  }
+  $lts_url = $debian_url
+  $volatile_url = 'http://volatile.debian.org/debian-volatile/'
+  $repos = 'auto'
+  $custom_preferences = ''
+  $custom_key_dir = false
+}