diff options
author | drebs <drebs@riseup.net> | 2010-12-12 19:11:01 -0200 |
---|---|---|
committer | drebs <drebs@riseup.net> | 2010-12-12 19:11:01 -0200 |
commit | e6ff4f1a2d1c4ef587b45138e61d30563d2b9da6 (patch) | |
tree | 0bc3b3949d7d7ef16e30dd3104e7b1d946502ff4 | |
parent | 98b043bdab72b66276cb3bba0784579d6bfbd4a6 (diff) | |
download | puppet-apt-e6ff4f1a2d1c4ef587b45138e61d30563d2b9da6.tar.gz puppet-apt-e6ff4f1a2d1c4ef587b45138e61d30563d2b9da6.tar.bz2 |
fixing alias bug
-rw-r--r-- | manifests/init.pp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index ae645c6..0702d88 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -65,7 +65,7 @@ class apt { default: { config_file { "/etc/apt/preferences": content => $custom_preferences, - alias => apt_config, + alias => "apt_config", require => File["/etc/apt/sources.list"]; } } @@ -75,15 +75,15 @@ class apt { # this just pins unstable and testing to very low values "/etc/apt/preferences": content => template("apt/preferences.erb"), - # use File[apt_config] to reference a completed configuration + # use Config_File["apt_config"] to reference a completed configuration # See "The Puppet Semaphor" 2007-06-25 on the puppet-users ML - alias => apt_config, + alias => "apt_config", # only update together require => File["/etc/apt/sources.list"]; # little default settings which keep the system sane "/etc/apt/apt.conf.d/from_puppet": content => "APT::Get::Show-Upgraded true;\nDSelect::Clean $real_apt_clean;\n", - before => File[apt_config]; + before => Config_File["apt_config"]; } } @@ -98,12 +98,12 @@ class apt { refreshonly => true, subscribe => [ File["/etc/apt/sources.list"], File["/etc/apt/preferences"], File["/etc/apt/apt.conf.d"], - File[apt_config] ], + Config_File["apt_config"] ], } if $apt_update_method == 'exec' { exec { "/usr/bin/apt-get update > /dev/null 2>&1 && /usr/bin/apt-get autoclean > /dev/null 2>&1 #hourly": - require => [ File["/etc/apt/sources.list"], File["/etc/apt/preferences"], File[apt_config] ], + require => [ File["/etc/apt/sources.list"], File["/etc/apt/preferences"], Config_File["apt_config"] ], # Another Semaphor for all packages to reference alias => apt_updated, } @@ -114,7 +114,7 @@ class apt { hour => "*/1", minute => "0", ensure => present, - require => [ File["/etc/apt/sources.list"], File["/etc/apt/preferences"], File[apt_config] ], + require => [ File["/etc/apt/sources.list"], File["/etc/apt/preferences"], Config_File["apt_config"] ], } } @@ -163,7 +163,7 @@ class apt { alias => "backports_key", refreshonly => true, subscribe => File["${apt_base_dir}/backports.org.key"], - before => [ File[apt_config], Package["debian-backports-keyring"] ] + before => [ Config_File["apt_config"], Package["debian-backports-keyring"] ] } } lenny: { @@ -182,7 +182,7 @@ class apt { alias => "backports_key", refreshonly => true, subscribe => File["${apt_base_dir}/backports.org.key"], - before => [ File[apt_config], Package["debian-backports-keyring"] ] + before => [ Config_File["apt_config"], Package["debian-backports-keyring"] ] } } } @@ -205,7 +205,7 @@ class apt { alias => "custom_keys", subscribe => File["${apt_base_dir}/keys.d"], refreshonly => true, - before => File[apt_config]; + before => Config_File["apt_config"]; } } } @@ -260,7 +260,7 @@ class apt { group => root, mode => 0644, content => template("apt/proxy.erb"), - require => File[apt_config], + require => Config_File["apt_config"], } } else { file { "/etc/apt/apt.conf.d/proxy": |