diff options
author | intrigeri <intrigeri@boum.org> | 2010-11-21 16:24:57 +0100 |
---|---|---|
committer | intrigeri <intrigeri@boum.org> | 2010-11-21 16:24:57 +0100 |
commit | ee6d13d1e42acca7374aa302a4f9dfa9001d799f (patch) | |
tree | f7d45d0a313a9fd5794ed11ee47418f53fb07047 /manifests/default_sources_list.pp | |
parent | 06a2957f9f0c2b4060709150afa194b98c6995ba (diff) | |
parent | ac76a5d52df78aec919f08334ca5b140902a9298 (diff) |
Merge commit 'ac76a5d52df78aec919f08334ca5b140902a9298'
(Starting to merge changes from immerda.)
Conflicts:
manifests/default_sources_list.pp
manifests/init.pp
Diffstat (limited to 'manifests/default_sources_list.pp')
-rw-r--r-- | manifests/default_sources_list.pp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/manifests/default_sources_list.pp b/manifests/default_sources_list.pp deleted file mode 100644 index 91955d7..0000000 --- a/manifests/default_sources_list.pp +++ /dev/null @@ -1,10 +0,0 @@ -class apt::default_sources_list { - config_file { - # include main, security and backports - # additional sources could be included via an array - "/etc/apt/sources.list": - content => template("apt/${operatingsystem}/sources.list.erb"), - require => Package['lsb']; - } -} - |