Merge pull request #4 from wazuh/development

v1.05

Author: jesuslinares

CHANGELOG.md

@@ -1,6 +1,13 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [v1.05] - 2016-01-27
+### Fixed
+- *ossec_ruleset.py*:
+  - Problem with installation path
+  - New path: /var/ossec/**update/ruleset/**ossec_ruleset.py
+
+
 ## [v1.04] - 2016-01-25
 ### Added
 - New Rootcheck: SSH Hardening

VERSION

@@ -1 +1 @@
-1.04
+1.05

ossec_ruleset.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # OSSEC Ruleset Installer and Updater
 
-# v2.2 2016/01/25
+# v2.2 2016/01/27
 # Created by Wazuh, Inc. <[email protected]>.
 # [email protected]
 # This program is a free software; you can redistribute it and/or modify it under the terms of GPLv2
@@ -337,7 +337,11 @@ def get_ruleset_from_menu(type_ruleset):
             logger.log("\nError: No folder {0}".format(directory))
             sys.exit(2)
 
-        type_directory = "rules" if "rules" in directory else "rootchecks"
+        last_path = directory.split("/")[-1]
+        if last_path == "rootcheck":
+            type_directory = "rootchecks"
+        else:
+            type_directory = "rules"
 
         ruleset_select = []
 
@@ -1139,7 +1143,7 @@ def usage():
     # Vars
     ossec_path = "/var/ossec"
     ossec_conf = "{0}/etc/ossec.conf".format(ossec_path)
-    updater_path = "{0}/updater/ruleset".format(ossec_path)
+    updater_path = "{0}/update/ruleset".format(ossec_path)
     # updater_path = "."
     bk_directory = "{0}/backups".format(updater_path)
     log_path = "{0}/ossec_ruleset.log".format(updater_path)