From 42ea70598da61919f18f4ffd1705ab1210232d61 Mon Sep 17 00:00:00 2001 From: ts Date: Sun, 1 Dec 2019 15:55:08 +0000 Subject: [PATCH] wip: --- .../unix/logging/wazuh/manifests/agent.pp | 6 ++++-- .../wazuh/templates/wazuh-register.rb.erb | 16 ++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/modules/utilities/unix/logging/wazuh/manifests/agent.pp b/modules/utilities/unix/logging/wazuh/manifests/agent.pp index 260212e81..1033a7548 100644 --- a/modules/utilities/unix/logging/wazuh/manifests/agent.pp +++ b/modules/utilities/unix/logging/wazuh/manifests/agent.pp @@ -450,10 +450,12 @@ class wazuh::agent( content => template('wazuh/wazuh-register.rb.erb'), require => Exec['mkdir ossec directories'], } - service { 'wazuh-register.service': + service { 'wazuh-register': ensure => undef, enable => true, - require => File['/var/ossec/bin/wazuh-register.rb'] + require => File['/var/ossec/bin/wazuh-register.rb'], + provider => 'systemd', + path => '/etc/systemd/system/' } if $wazuh_reporting_endpoint != undef { diff --git a/modules/utilities/unix/logging/wazuh/templates/wazuh-register.rb.erb b/modules/utilities/unix/logging/wazuh/templates/wazuh-register.rb.erb index b20a7c3d6..a0b3bc9a7 100644 --- a/modules/utilities/unix/logging/wazuh/templates/wazuh-register.rb.erb +++ b/modules/utilities/unix/logging/wazuh/templates/wazuh-register.rb.erb @@ -4,22 +4,22 @@ require 'open3' @registered_file = '/wr' +def already_registered? + File.file? @registered_file +end + until already_registered? if already_registered? # disable service - sleep(100) + # sleep(100) else - stdout, _, _= Open3.capture3("/var/ossec/bin/agent-auth -m <%= @kibana_elasticsearch_ip -%> -A <% @system_name %>") + stdout, _, _= Open3.capture3("/var/ossec/bin/agent-auth -m <%= @kibana_elasticsearch_ip -%> -A '<%= @system_name -%>'") if stdout.include? 'Valid key created. Finished' FileUtils.touch @registered_file end end - sleep(30) + # sleep(30) end -exit(0) - -def already_registered? - File.file? @registered_file -end \ No newline at end of file +exit(0) \ No newline at end of file