Changes for new release

CHANGELOG.md

@@ -1,18 +1,21 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [Unreleased - v1.04] - 2016-01-??
+## [v1.04] - 2016-01-25
 ### Added
 - New Rootcheck: SSH Hardening
-- New rules: ossec_ruleset.py rules -> Alerts when OSSEC ruleset is updated using ossec_ruleset.py
+- New rules: *ossec_ruleset.py* rules
+  - Alerts related to the execution of script *ossec_ruleset.py*
 - New rules and PCI Tagging for:
   - Amazon IAM
   - Amazon EC2
 
 ### Changed
-- *ossec_ruleset.py*: 
-  - Log file format
-  - New path: /var/ossec/updater
+- *ossec_ruleset.py*:
+  - New format for *ossec_ruleset.log*
+  - New path: */var/ossec/updater/ruleset*
+     - All files generated by the script are stored in this directory.
+     - We recommend this path to the script: /var/ossec/updater/ruleset/ossec_ruleset.py
 
 
 ## [v1.03] - 2016-01-08

VERSION

@@ -1 +1 @@
-1.03
+1.04

ossec_ruleset.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # OSSEC Ruleset Installer and Updater
 
-# v2.2 2016/01/21
+# v2.2 2016/01/25
 # 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
@@ -12,7 +12,7 @@
 #  root privileges
 
 # Instructions:
-#  sudo mkdir /var/ossec/updater && cd /var/ossec/updater
+#  sudo mkdir /var/ossec/updater/ruleset && cd /var/ossec/updater/ruleset
 #  sudo wget https://raw.githubusercontent.com/wazuh/ossec-rules/master/ossec_ruleset.py
 #  sudo chmod +x ossec_ruleset.py
 #  sudo ./ossec_ruleset.py --help
@@ -1088,7 +1088,7 @@ def compatibility_with_old_versions():
 
 def usage():
     msg = """
-OSSEC Wazuh Ruleset installer & updater v2.0
+OSSEC Wazuh Ruleset installer & updater v2.2
 Github repository: https://github.com/wazuh/ossec-rules
 Full documentation: http://documentation.wazuh.com/en/latest/ossec_ruleset.html
 
@@ -1133,13 +1133,13 @@ def usage():
 if __name__ == "__main__":
     # Config
     MAX_BACKUPS = 50
-    # url_ruleset = "http://ossec.wazuh.com/ruleset/ruleset.zip"
-    url_ruleset = "http://ossec.wazuh.com/ruleset/ruleset_development.zip"
+    url_ruleset = "http://ossec.wazuh.com/ruleset/ruleset.zip"
+    # url_ruleset = "http://ossec.wazuh.com/ruleset/ruleset_development.zip"
 
     # Vars
     ossec_path = "/var/ossec"
     ossec_conf = "{0}/etc/ossec.conf".format(ossec_path)
-    updater_path = "{0}/updater".format(ossec_path)
+    updater_path = "{0}/updater/ruleset".format(ossec_path)
     # updater_path = "."
     bk_directory = "{0}/backups".format(updater_path)
     log_path = "{0}/ossec_ruleset.log".format(updater_path)