diff --git a/lib/facter/apt_sources.rb b/lib/facter/apt_sources.rb index c985802010..17c5d089e8 100644 --- a/lib/facter/apt_sources.rb +++ b/lib/facter/apt_sources.rb @@ -5,7 +5,7 @@ confine osfamily: 'Debian' setcode do sources = ['sources.list'] - Dir.glob('/etc/apt/sources.list.d/*.list').each do |file| + Dir.glob('/etc/apt/sources.list.d/*.{list,sources}').each do |file| sources.push(File.basename(file)) end sources diff --git a/manifests/ppa.pp b/manifests/ppa.pp index 1bb4c81866..b1a055ecae 100644 --- a/manifests/ppa.pp +++ b/manifests/ppa.pp @@ -53,7 +53,11 @@ $underscore_filename_no_slashes = regsubst($underscore_filename, '/', '-', 'G') $underscore_filename_no_specialchars = regsubst($underscore_filename_no_slashes, '[\.\+]', '_', 'G') - $sources_list_d_filename = "${dash_filename_no_specialchars}-${release}.list" + $sources_list_d_filename = if versioncmp($facts['os']['release']['full'], '23.10') < 0 { + "${dash_filename_no_specialchars}-${release}.list" + } else { + "${dash_filename_no_specialchars}-${release}.sources" + } if versioncmp($facts['os']['release']['full'], '21.04') < 0 { $trusted_gpg_d_filename = "${underscore_filename_no_specialchars}.gpg"