Merge pull request #236 from weaselp/master

Add Debian 12 support
voxpupuli · Oct 29, 2023 · 61c78ca · 61c78ca
2 parents 76e8314 + 0cbeec7
commit 61c78ca
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -12,19 +12,16 @@
 
  case downcase($facts['os']['name']) {
  'debian', 'raspbian': {
- case fact('os.distro.codename') {
- 'bullseye': {
- $origins = [
- 'origin=Debian,codename=${distro_codename},label=Debian', #lint:ignore:single_quote_string_with_variables
- 'origin=Debian,codename=${distro_codename}-security,label=Debian-Security', #lint:ignore:single_quote_string_with_variables
- ]
- }
- default: {
- $origins = [
- 'origin=Debian,codename=${distro_codename},label=Debian', #lint:ignore:single_quote_string_with_variables
- 'origin=Debian,codename=${distro_codename},label=Debian-Security', #lint:ignore:single_quote_string_with_variables
- ]
- }
+ if versioncmp($facts['os']['release']['major'], '11') >= 0 {
+ $origins = [
+ 'origin=Debian,codename=${distro_codename},label=Debian', #lint:ignore:single_quote_string_with_variables
+ 'origin=Debian,codename=${distro_codename}-security,label=Debian-Security', #lint:ignore:single_quote_string_with_variables
+ ]
+ } else {
+ $origins = [
+ 'origin=Debian,codename=${distro_codename},label=Debian', #lint:ignore:single_quote_string_with_variables
+ 'origin=Debian,codename=${distro_codename},label=Debian-Security', #lint:ignore:single_quote_string_with_variables
+ ]
  }
  }
  'ubuntu', 'neon': {

diff --git a/metadata.json b/metadata.json
@@ -20,7 +20,8 @@
  "operatingsystem": "Debian",
  "operatingsystemrelease": [
  "10",
- "11"
+ "11",
+ "12"
  ]
  },
  {

diff --git a/spec/classes/other_debians_spec.rb b/spec/classes/other_debians_spec.rb
@@ -12,7 +12,9 @@
  name: 'Raspbian',
  family: 'Debian',
  release: {
- full: '8.0'
+ full: '8.0',
+ major: '8',
+ minor: '0'
  }
  },
  osfamily: 'Debian',