Prevent duplicate declaration in firewalld_ipset

Fixes simp#49
silug · Apr 29, 2024 · 2dffd99 · 2dffd99
1 parent 6836cea
commit 2dffd99
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+* Mon Apr 29 2024 Steven Pritchard <[email protected]> - 0.10.1
+- Prevent duplicate declaration in `firewalld_ipset` (#49)
+
 * Thu Jan 18 2024 Mike Riddle <[email protected]> - 0.10.0
 - Made the 99_simp zone purge parameters toggle-able
 

diff --git a/manifests/rule.pp b/manifests/rule.pp
@@ -208,7 +208,7 @@
                   'simp',
                   seeded_rand_string(
                     26,
-                    join([$_ipset_family, $_ipset_type] + sort(unique($_trusted_nets)),'')
+                    join([$_ipset_family, $_ipset_type] + sort(unique($_trusted_nets)) + $_ipset_entries,'')
                   )
                 ], '-')[0,31]
 

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "simp-simp_firewalld",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "author": "SIMP Team",
   "summary": "SIMP-oriented firewalld management",
   "license": "Apache-2.0",