Merge pull request #45 from redBorder/development

Release 0.7.1
redBorder · Sep 18, 2024 · c5ebbda · c5ebbda
2 parents 176323b + a932601
commit c5ebbda
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 cookbook-rb-ips CHANGELOG
 ===============
 
+## 0.7.1
+
+  - Luis J Blanco Mier
+    - [9630389] add clean operation in makefile
+  - Jose Navarro
+    - [2289d8e] Migrate view raw funtionality
+
 ## 0.7.0
 
   - nilsver

diff --git a/Makefile b/Makefile
@@ -3,5 +3,7 @@ all: rpm
 rpm:
 	$(MAKE) -C packaging/rpm
 
+clean:
+	$(MAKE) -C packaging/rpm clean
 rpmtest:
 	$(MAKE) LATEST=`git stash create` -C packaging/rpm
diff --git a/resources/metadata.rb b/resources/metadata.rb
@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 name             'rb-ips'
 maintainer       'Eneo Tecnología S.L.'
 maintainer_email 'git@redborder.com'
 license          'AGPL-3.0'
 description      'Installs/Configures redborder ips'
-version          '0.7.0'
+version          '0.7.1'
 
 depends 'rb-common'
 depends 'geoip'

diff --git a/resources/recipes/configure.rb b/resources/recipes/configure.rb
@@ -155,22 +155,22 @@
 unless node['redborder']['cloud']
   # ssh user for webui execute commands on
   execute 'create_user_redBorder' do
-    command 'sudo useradd -m -s /bin/bash redBorder'
-    not_if 'getent passwd redBorder'
+    command 'sudo useradd -m -s /bin/bash redborder'
+    not_if 'getent passwd redborder'
   end
 
-  directory '/home/redBorder/.ssh' do
-    owner 'redBorder'
-    group 'redBorder'
+  directory '/home/redborder/.ssh' do
+    owner 'redborder'
+    group 'redborder'
     mode '0755'
     action :create
   end
 
   unless ssh_secrets.empty? || ssh_secrets['public_rsa'].nil?
-    template '/home/redBorder/.ssh/authorized_keys' do
+    template '/home/redborder/.ssh/authorized_keys' do
       source 'rsa.pub.erb'
-      owner 'redBorder'
-      group 'redBorder'
+      owner 'redborder'
+      group 'redborder'
       mode '0600'
       variables(
         public_rsa: ssh_secrets['public_rsa']

diff --git a/resources/templates/default/redBorder.erb b/resources/templates/default/redBorder.erb
@@ -12,7 +12,7 @@
 <%# You should have received a copy of the GNU Affero General Public License License %>
 <%# along with redBorder. If not, see <http://www.gnu.org/licenses/>. %>
 <%####################################################################### %>
-Defaults:redBorder !requiretty
+Defaults:redborder !requiretty
 Defaults:rb-monitor !requiretty, !syslog 
-redBorder      ALL= NOPASSWD:SETENV: /bin/env BOOTUP=none /usr/lib/redborder/bin/rb_get_sensor_rules.sh *, /usr/lib/redborder/bin/rb_bypass.sh, /usr/lib/redborder/bin/rb_wakeup_chef, /usr/lib/redborder/bin/rb_disassociate_sensor.sh -f, /usr/lib/redborder/bin/rb_update_geoip, /sbin/service chef-client restart, /usr/lib/redborder/bin/rb_u2pcap.sh, /usr/lib/redborder/bin/rb_update_redborder_rpms.sh -f
-rb-monitor     ALL= NOPASSWD: /usr/lib/redborder/bin/rb_get_perfmonitor_stats.sh, /usr/lib/redborder/bin/rb_get_sensor.sh, /usr/lib/redborder/bin/rb_get_pfring_stats.sh, /bin/nice -n 19 /usr/sbin/fping -p 1 -c 10 kafka.<%= node["redborder"]["cdomain"] %>
+redborder      ALL= NOPASSWD:SETENV: /usr/bin/env BOOTUP=none /usr/lib/redborder/bin/rb_get_sensor_rules.sh *, /usr/lib/redborder/bin/rb_bypass.sh, /usr/lib/redborder/bin/rb_wakeup_chef.sh, /usr/lib/redborder/bin/rb_disassociate.sh -f, /sbin/service chef-client restart, /usr/lib/redborder/bin/rb_u2pcap.sh *, /usr/lib/redborder/bin/rb_update_geoip, /usr/lib/redborder/bin/rb_update_redborder_rpms.sh -f
+rb-monitor     ALL= NOPASSWD: /usr/lib/redborder/bin/rb_get_perfmonitor_stats.sh, /usr/lib/redborder/bin/rb_get_sensor.sh, /usr/lib/redborder/bin/rb_get_pfring_stats.sh, /usr/bin/nice -n 19 /usr/sbin/fping -p 1 -c 10 kafka.<%= node["redborder"]["cdomain"] %>