Merge pull request #13 from redBorder/bug/#16282_add_file_country

Add country.dat file
redBorder · Apr 9, 2024 · e36b21f · e36b21f
2 parents b306a01 + ee0cee6
commit e36b21f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/resources/files/default/country.dat b/resources/files/default/country.dat
diff --git a/resources/recipes/configure.rb b/resources/recipes/configure.rb
@@ -68,6 +68,13 @@
   mode "0400"
 end
 
+cookbook_file "/usr/share/GeoIP/country.dat" do
+  source "country.dat"
+  owner "root"
+  group "root"
+  mode "0644"
+end
+
 if sensor_id>0
   if node.name.start_with?"rbipscp-"
     node.run_list(["role[ipscp-sensor]", "role[rBsensor-#{sensor_id}]", "role[ipscp-sensor]"])
@@ -353,7 +360,7 @@
 if !node["redborder"]["ipsrules"].nil? and !node["redborder"]["cloud"].nil? 
     node["redborder"]["ipsrules"].to_hash.each do |groupid, ipsrules| 
       if node["redborder"]["ipsrules"][groupid]["command"] and !node["redborder"]["ipsrules"][groupid]["command"].empty? and node["redborder"]["ipsrules"][groupid]["timestamp"].to_i > 0 and node["redborder"]["ipsrules"][groupid]["timestamp_last"].to_i < node["redborder"]["ipsrules"][groupid]["timestamp"].to_i and node["redborder"]["ipsrules"][groupid]["uuid"] and !node["redborder"]["ipsrules"][groupid]["uuid"].empty?
-        command=node["redborder"]["ipsrules"][groupid]["command"].to_s.gsub!(/^sudo /, "").gsub(/;/, " ")
+        command=node["redborder"]["ipsrules"][groupid]["command"].to_s.gsub(/^sudo /, "").gsub(/;/, " ")
         if command.start_with?'/bin/env BOOTUP=none /usr/lib/redborder/bin/rb_get_sensor_rules.sh '
           execute "download_rules_#{groupid}" do 
             command "/usr/lib/redborder/scripts/rb_get_sensor_rules_cloud.rb -c '#{command}' -u #{node["redborder"]["ipsrules"][groupid]["uuid"].to_s}"