diff --git a/README.md b/README.md index d9983b50e8..44cd89d05c 100644 --- a/README.md +++ b/README.md @@ -181,7 +181,7 @@ apt::source { 'debian_unstable': comment => 'This is the iWeb Debian unstable mirror', location => 'http://debian.mirror.iweb.ca/debian/', release => 'unstable', - repos => 'main contrib non-free', + repos => 'main contrib non-free non-free-firmware', pin => '-10', key => { 'id' => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553', @@ -235,7 +235,7 @@ apt::sources: comment: 'This is the iWeb Debian unstable mirror' location: 'http://debian.mirror.iweb.ca/debian/' release: 'unstable' - repos: 'main contrib non-free' + repos: 'main contrib non-free non-free-firmware' pin: '-10' key: id: 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553' diff --git a/REFERENCE.md b/REFERENCE.md index 60c2435cc1..980848ac4e 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -507,7 +507,7 @@ Data type: `Optional[String[1]]` Specifies a component of the Apt repository containing the backports to manage. Used in populating the `sources.list` configuration file. Default value for Debian and Ubuntu varies: -- Debian: 'main contrib non-free' +- Debian: 'main contrib non-free non-free-firmware' - Ubuntu: 'main universe multiverse restricted' diff --git a/data/os/Debian/12.yaml b/data/os/Debian/12.yaml new file mode 100644 index 0000000000..c09df5e4f4 --- /dev/null +++ b/data/os/Debian/12.yaml @@ -0,0 +1,3 @@ +apt::backports: + location: http://deb.debian.org/debian + repos: main contrib non-free non-free-firmware diff --git a/examples/source.pp b/examples/source.pp index c4791af5e1..2227cce65c 100644 --- a/examples/source.pp +++ b/examples/source.pp @@ -16,7 +16,7 @@ apt::source { 'debian_testing': location => 'http://debian.mirror.iweb.ca/debian/', release => 'testing', - repos => 'main contrib non-free', + repos => 'main contrib non-free non-free-firmware', key => { id => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553', server => 'keyserver.ubuntu.com', @@ -26,7 +26,7 @@ apt::source { 'debian_unstable': location => 'http://debian.mirror.iweb.ca/debian/', release => 'unstable', - repos => 'main contrib non-free', + repos => 'main contrib non-free non-free-firmware', key => { id => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553', server => 'keyserver.ubuntu.com', diff --git a/manifests/backports.pp b/manifests/backports.pp index a47c23a8d9..83e3c49500 100644 --- a/manifests/backports.pp +++ b/manifests/backports.pp @@ -20,7 +20,7 @@ # Specifies a component of the Apt repository containing the backports to manage. Used in populating the `sources.list` configuration file. # Default value for Debian and Ubuntu varies: # -# - Debian: 'main contrib non-free' +# - Debian: 'main contrib non-free non-free-firmware' # # - Ubuntu: 'main universe multiverse restricted' # diff --git a/spec/classes/apt_backports_spec.rb b/spec/classes/apt_backports_spec.rb index 3945449f6c..23031ab73a 100644 --- a/spec/classes/apt_backports_spec.rb +++ b/spec/classes/apt_backports_spec.rb @@ -13,12 +13,12 @@ family: 'Debian', name: 'Debian', release: { - full: '11.8', - major: '11', - minor: '8' + full: '12.5', + major: '12', + minor: '5' }, distro: { - codename: 'bullseye', + codename: 'bookworm', id: 'Debian' } } @@ -28,11 +28,11 @@ it { expect(subject).to contain_apt__source('backports').with( location: 'http://deb.debian.org/debian', - repos: 'main contrib non-free', - release: 'bullseye-backports', + repos: 'main contrib non-free non-free-firmware', + release: 'bookworm-backports', pin: { 'priority' => 200, - 'release' => 'bullseye-backports' + 'release' => 'bookworm-backports' }, keyring: '/usr/share/keyrings/debian-archive-keyring.gpg', )