Merge branch 'master' into improvement/16142_motd

redBorder · Feb 8, 2024 · 6910ed6 · 6910ed6
2 parents 361cdb6 + d9ecb8a
commit 6910ed6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/packaging/rpm/cookbook-rb-ips.spec b/packaging/rpm/cookbook-rb-ips.spec
@@ -45,6 +45,8 @@ esac
 %doc
 
 %changelog
+* Wed Jan 23 2024 David Vanhoucke <[email protected]> - 0.1.6
+- Fix redborder-monitor
 * Thu Jan 18 2024 Miguel Negrón <[email protected]> - 0.1.5
 - Add journalctld configuration
 * Thu Dec 14 2023 Miguel Álvarez <[email protected]> - 0.1.4

diff --git a/resources/metadata.rb b/resources/metadata.rb
@@ -4,7 +4,7 @@
 license          'All rights reserved'
 description      'Installs/Configures redborder ips'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.1.5'
+version          '0.1.6'
 
 depends 'geoip'
 depends 'snmp'

diff --git a/resources/recipes/configure.rb b/resources/recipes/configure.rb
@@ -303,11 +303,10 @@
       end # if sensor.id>0
 end # if node
 
-# rbmonitor_config "Configure redborder-monitor" do
-#     name node["hostname"]
-#     monitors monitors_dg["monitors"]
-#     action ((ips_services["redborder-monitor"] and sensor_id > 0) ? :add : :remove)
-# end   
+  rbmonitor_config "Configure redborder-monitor" do
+      name node["hostname"]
+      action ((ips_services["redborder-monitor"] and sensor_id > 0) ? :add : :remove)
+  end   
 
   ###template "/etc/rb_snmp_pass.yml" do
   ###  source "rb_snmp_pass.yml.erb"