Merge pull request #65 from redBorder/development

release 3.1.4

Author: jnavarrorb

VERSION

@@ -1 +1 @@
-3.1.3
+3.1.4

resources/lib/rb_config_utils.rb

@@ -15,8 +15,11 @@
 
 module Config_utils
 
+    LOG_DIRECTORY = '/var/log/rb-register-common'
+    LOG_FILE_NAME = 'register.log'
 
     @modelist_path="/usr/lib/redborder/mode-list.yml"
+
     #Function to check if mode is valid (if defined in mode-list.yml)
     #Returns true if it's valid and false if not
     #TODO: protect from exception like file not found
@@ -80,13 +83,15 @@ def self.replace_chef_server_url(cdomain)
       end
     end
 
+    def self.log_file
+      File.join(LOG_DIRECTORY, LOG_FILE_NAME)
+    end
+
     # Create log file for registration without rb-register
     def self.ensure_log_file_exists
-      log_directory = '/var/log/rb-register-common'
-      log_file = "#{log_directory}/register.log"
 
-      unless Dir.exist?(log_directory)
-        system("mkdir -p #{log_directory}")
+      unless Dir.exist?(LOG_DIRECTORY)
+        system("mkdir -p #{LOG_DIRECTORY}")
       end
 
       if File.exist?(log_file)

resources/scripts/rb_init_conf.rb

@@ -344,18 +344,23 @@ def local_tty_warning_wizard
     end
   else
     system("sudo hostnamectl set-hostname #{ips_node_name}")
-    system("/usr/lib/redborder/scripts/rb_associate_sensor.rb -u #{webui_user} -p #{webui_pass} -i #{Config_utils.get_ip_address} -m #{webui_host}")
+    Config_utils.ensure_log_file_exists
+    system("echo 'Sensor #{ips_node_name} association in progress...' > #{Config_utils.log_file}")
+    system("/usr/lib/redborder/scripts/rb_associate_sensor.rb -u #{webui_user} -p #{webui_pass} -i #{Config_utils.get_ip_address} -m #{webui_host} >> #{Config_utils.log_file} 2>&1")
     if $?.exitstatus == 0
       Config_utils.hook_hosts(webui_host, cdomain)
       Config_utils.replace_chef_server_url(cdomain)
-      Config_utils.ensure_log_file_exists
+      
       system("sed -i '/webui_pass/d' #{INITCONF}")
       puts "Sensor registered to the manager, please wait..."
-      puts "You can see logs in /var/log/rb-register-common/register.log"
-      system('/usr/lib/redborder/bin/rb_register_finish.sh > /var/log/rb-register-common/register.log 2>&1')
+      puts "You can see logs in #{Config_utils.log_file}"
+      system("/usr/lib/redborder/bin/rb_register_finish.sh >> #{Config_utils.log_file} 2>&1")
       puts "Registration and configuration finished!"
     else
-      puts "Error: rb_associate_sensor.rb failed with exit status #{$?.exitstatus}. Please review #{INITCONF} file or network configuration..."
+      
+      puts "Error: Sensor association failed with exit status #{$?.exitstatus}."
+      puts "Please review #{INITCONF} file or network configuration..."
+      puts "See \"#{Config_utils.log_file}\" for more details."
     end
   end
 end