summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2010-10-17 15:18:08 +0200
committermh <mh@immerda.ch>2010-10-17 15:18:08 +0200
commite19c94dcd20c966143c933e22d5a63f350649b6e (patch)
treeb3625ca4e16decf34ec673ecea414e402f566dec
parent9d1a018eedee3f65e2651cd1e3bdd9da5ae5518d (diff)
minor improvements, especially do not refresh apt every run
-rw-r--r--README4
-rw-r--r--manifests/init.pp10
2 files changed, 7 insertions, 7 deletions
diff --git a/README b/README
index 5f8225a..833008e 100644
--- a/README
+++ b/README
@@ -89,8 +89,8 @@ Example:
Resources
=========
-File[apt_config]
-----------------
+Concatenated_file[apt_config]
+-----------------------------
Use this resource to depend on or add to a completed apt configuration
Exec[apt_updated]
diff --git a/manifests/init.pp b/manifests/init.pp
index 12096a0..675c78d 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -46,13 +46,13 @@ class apt {
'refresh_apt':
command => '/usr/bin/apt-get update && sleep 1',
refreshonly => true,
- subscribe => [ File["/etc/apt/sources.list"],
- File["/etc/apt/apt.conf.d"],
- Concatenated_file[apt_config] ];
+ subscribe => File['/etc/apt/sources.list',
+ '/etc/apt/apt.conf.d',
+ '/etc/apt/preferences'];
'update_apt':
command => '/usr/bin/apt-get update && /usr/bin/apt-get autoclean',
- require => [ File["/etc/apt/sources.list"],
- File["/etc/apt/preferences"], Concatenated_file[apt_config] ],
+ require => File['/etc/apt/sources.list',
+ '/etc/apt/preferences'],
loglevel => info,
# Another Semaphor for all packages to reference
alias => apt_updated;