aboutsummaryrefslogtreecommitdiff
path: root/manifests/init.pp
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/init.pp')
-rw-r--r--manifests/init.pp15
1 files changed, 8 insertions, 7 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 3de4d9e..c098ef3 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -8,13 +8,14 @@ class apt(
$use_volatile = false,
$include_src = false,
$use_next_release = false,
- $debian_url = 'http://cdn.debian.net/debian/',
+ $debian_url = 'http://http.debian.net/debian/',
$security_url = 'http://security.debian.org/',
$backports_url = 'http://backports.debian.org/debian-backports/',
$volatile_url = 'http://volatile.debian.org/debian-volatile/',
$ubuntu_url = 'http://archive.ubuntu.com/ubuntu',
$repos = 'auto',
- $custom_preferences = ''
+ $custom_preferences = '',
+ $disable_update = false
){
case $::operatingsystem {
'debian': {
@@ -44,6 +45,9 @@ class apt(
$codename = $::lsbdistcodename
$release = $::lsbdistrelease
}
+ 'n/a': {
+ fail("Unknown lsbdistcodename reported by facter: '$lsbdistcodename', please fix this by setting this variable in your manifest.")
+ }
default: {
$release = debian_release($codename)
}
@@ -60,6 +64,7 @@ class apt(
'' => template( "apt/${::operatingsystem}/sources.list.erb"),
default => $custom_sources_list
},
+ mode => 0644, owner => root, group => 0,
require => Package['lsb'],
notify => Exec['refresh_apt'],
owner => root, group => 0, mode => 0644;
@@ -106,10 +111,6 @@ class apt(
# backports uses the normal archive key now
package { "debian-backports-keyring": ensure => absent }
- include common::moduledir
- $apt_base_dir = "${common::moduledir::module_dir_path}/apt"
- modules_dir { apt: }
-
if $custom_key_dir {
file { "${apt_base_dir}/keys.d":
source => "$custom_key_dir",
@@ -123,7 +124,7 @@ class apt(
}
if $custom_preferences != false {
Exec["custom_keys"] {
- before => Concat[apt_config],
+ before => File['apt_config'],
}
}
}