Merge pull request #1040 from zilchms/debian12

bastelfreak · web-flow · commit f3526e8431cf · 2024-02-23T15:06:32.000+01:00
Add Debian 12 support
diff --git a/manifests/plugin/rabbitmq.pp b/manifests/plugin/rabbitmq.pp
@@ -63,7 +63,7 @@
 
   if $facts['os']['family'] == 'Debian' or
   $facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'], '8') >= 0 or
-  $facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '20.04') >= 0 {
+  $facts['os']['name'] == 'Ubuntu' {
     fail('https://pypi.org/project/collectd-rabbitmq/ does not support Python 3')
   }
 
diff --git a/metadata.json b/metadata.json
@@ -63,14 +63,15 @@
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "11"
+        "11",
+        "12"
       ]
     },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "18.04",
-        "20.04"
+        "20.04",
+        "22.04"
       ]
     },
     {

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@`
`63`	`63`
`64`	`64`	`if $facts['os']['family'] == 'Debian' or`
`65`	`65`	`$facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'], '8') >= 0 or`
`66`		`- $facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '20.04') >= 0 {`
	`66`	`+ $facts['os']['name'] == 'Ubuntu' {`
`67`	`67`	`fail('https://pypi.org/project/collectd-rabbitmq/ does not support Python 3')`
`68`	`68`	`}`
`69`	`69`