From 27d5808299045ebd6f428e7d8131d11d9ab37712 Mon Sep 17 00:00:00 2001 From: Gabriel Filion Date: Mon, 25 Oct 2010 01:44:04 -0400 Subject: rename things for easier understanding remove the use of _snippet in names (except for preferences_snippet) so that they represent directly a resource name. rename custom_sources_template to sources_list. modify sources_list to make it more flexible (gives the opportunity to provide sources or content). this changes its behaviour in that the name is now the name of the file in sources.list.d rename proxy-client to proxy_client to use the same standard for its name as the other classes. Signed-off-by: Gabriel Filion --- manifests/init.pp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'manifests/init.pp') diff --git a/manifests/init.pp b/manifests/init.pp index 7d68303..695c193 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -5,8 +5,6 @@ class apt { - import "custom_sources.pp" - # See README $real_apt_clean = $apt_clean ? { '' => 'auto', @@ -21,8 +19,7 @@ class apt { include lsb config_file { # include main, security and backports - # additional sources should be included via the custom_sources_template - # define + # additional sources should be included via the apt::sources_list define "/etc/apt/sources.list": content => $custom_sources_list ? { '' => template( "apt/$operatingsystem/sources.list.erb"), @@ -32,13 +29,13 @@ class apt { } # 01autoremove already present by default - apt_conf_snippet{ "02show_upgraded": + apt_conf { "02show_upgraded": source => ["puppet:///modules/site-apt/${fqdn}/02show_upgraded", "puppet:///modules/site-apt/02show_upgraded", "puppet:///modules/apt/02show_upgraded"] } - apt_conf_snippet{ "03clean": + apt_conf { "03clean": source => ["puppet:///modules/site-apt/${fqdn}/03clean", "puppet:///modules/site-apt/03clean", "puppet:///modules/apt/03clean"] -- cgit v1.2.3