Update Release 4.2.4

wazuh · Oct 27, 2021 · 5372df3 · 5372df3
1 parent 625f330
commit 5372df3
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 59 deletions.
diff --git a/cookbooks/wazuh_agent/recipes/common.rb b/cookbooks/wazuh_agent/recipes/common.rb
@@ -17,19 +17,6 @@
 # limitations under the License.
 #
 
-#ruby_block 'ossec install_type' do
-#  block do
-#    File.open('/var/ossec/etc/ossec-init.conf') do |file|
-#      file.each_line do |line|
-#        if line =~ /^TYPE="([^"]+)"/
-#          type = Regexp.last_match(1)
-#          break
-#        end
-#      end
-#    end
-#  end
-#end
-
 # Gyoku renders the XML.
 chef_gem 'gyoku' do
   compile_time false if respond_to?(:compile_time)

diff --git a/cookbooks/wazuh_agent/test/integration/wazuh_agent/common_test.rb b/cookbooks/wazuh_agent/test/integration/wazuh_agent/common_test.rb
@@ -27,10 +27,6 @@
 
 # Check OSSEC dir
 
-#describe file('/var/ossec/etc/ossec-init.conf') do
-#    it { should be_symlink }
-#end
-
 describe file('/var/ossec') do
     it { should be_directory }
     its('mode') { should cmp '0750' }
@@ -45,13 +41,6 @@
     its('group') { should cmp 'ossec' }
 end
 
-#describe file('/etc/ossec-init.conf') do 
-#    it { should exist }
-#    its('owner') { should cmp 'root' }
-#    its('group') { should cmp 'ossec' }
-#    its('mode') { should cmp '0640' }
-#end
-
 describe file('/var/ossec/etc/ossec.conf') do 
     it { should exist }
     its('owner') { should cmp 'root' }

diff --git a/cookbooks/wazuh_manager/recipes/common.rb b/cookbooks/wazuh_manager/recipes/common.rb
@@ -8,15 +8,6 @@
       type = 'local'
     else
       type = "test"
-
-#      File.open('/var/ossec/etc/ossec-init.conf') do |file|
-#        file.each_line do |line|
-#          if line =~ /^TYPE="([^"]+)"/
-#            type = Regexp.last_match(1)
-#            break
-#          end
-#        end
-#       end
     end
 
     node.normal['ossec']['install_type'] = type

diff --git a/cookbooks/wazuh_manager/templates/default/api.yaml.erb b/cookbooks/wazuh_manager/templates/default/api.yaml.erb
@@ -3,21 +3,6 @@
 host: <%= @host %>
 port: <%= @port %>
 
-# Set this option to "yes" in case the API is running behind a proxy server. Values: yes, no
-#behind_proxy_server: no
-
-# Advanced configuration
-
-#https:
-  #enabled: yes
-  #key: "api/configuration/ssl/server.key"
-  #cert: "api/configuration/ssl/server.crt"
-  #use_ca: False
-  #ca: "api/configuration/ssl/ca.crt"
-  #ssl_protocol: 'TLSv1.2'
-  #ssl_ciphers:  '""'
-
-
 # Logging configuration
 # Values for API log level: disabled, info, warning, error, debug, debug2 (each level includes the previous level).
 logs:

diff --git a/cookbooks/wazuh_manager/test/integration/wazuh_manager/common_test.rb b/cookbooks/wazuh_manager/test/integration/wazuh_manager/common_test.rb
@@ -55,10 +55,6 @@
 
 # Check OSSEC dir
 
-#describe file('/var/ossec/etc/ossec-init.conf') do
-#    it { should be_symlink }
-#end
-
 describe file('/var/ossec') do
     it { should be_directory }
     its('mode') { should cmp '0750' }
@@ -73,13 +69,6 @@
     its('group') { should cmp 'ossec' }
 end
 
-#describe file('/etc/ossec-init.conf') do 
-#    it { should exist }
-#    its('owner') { should cmp 'root' }
-#    its('group') { should cmp 'ossec' }
-#    its('mode') { should cmp '0640' }
-#end
-
 describe file('/var/ossec/etc/shared/default/agent.conf') do 
     it { should exist }
     its('owner') { should cmp 'ossec' }