Merge pull request #1148 from wazuh/fix-feeds-patch-1

Fix Feeds

wazuh/Dockerfile

@@ -3,7 +3,7 @@ FROM waystonesystems/baseimage-centos:0.2.0
 
 # Arguments
 ARG FILEBEAT_VERSION=7.10.2
-ARG WAZUH_VERSION=4.5.4-0.debug
+ARG WAZUH_VERSION=4.7.0-0.debug
 
 # Environment variables
 ENV API_USER="foo" \
@@ -19,7 +19,7 @@ RUN set -x && \
     # Retrieve DEV package
     #curl -o /tmp/wazuh-manager-$WAZUH_VERSION.x86_64.rpm https://packages-dev.wazuh.com/pre-release/yum/wazuh-manager-$WAZUH_VERSION.x86_64.rpm && \
     # Retrieve PROD package
-    curl -o /tmp/wazuh-manager-$WAZUH_VERSION.x86_64.rpm https://packages.wazuh.com/cloud/4.5.x/rpm/wazuh-manager-$WAZUH_VERSION.x86_64.rpm && \
+    curl -o /tmp/wazuh-manager-$WAZUH_VERSION.x86_64.rpm https://packages-dev.wazuh.com/warehouse/debug/4.7/rpm/wazuh-manager-4.7.0-oval.x86_64.rpm && \
     yum update -y && \
     yum upgrade -y &&\
     yum install -y openssl vim expect python-boto python-pip python-cryptography postfix bsd-mailx mailx ca-certificates && \
@@ -112,3 +112,4 @@ EXPOSE 55000/tcp 1514/udp 1515/tcp 514/udp 1516/tcp
 
 # Run all services
 ENTRYPOINT ["/entrypoint.sh"]
+

wazuh/config/create_user.py

@@ -11,7 +11,7 @@ WUI_USER_FILE_PATH = "/var/ossec/api/configuration/wui-user.json"
 WAZUH_USER_FILE_PATH = "/var/ossec/api/configuration/wazuh-user.json"
 
 try:
-    from wazuh.rbac.orm import create_rbac_db
+    from wazuh.rbac.orm import check_database_integrity
     from wazuh.security import (
         create_user,
         get_users,
@@ -44,7 +44,7 @@ if __name__ == "__main__":
 
     wui_password = read_wui_user_file()
     wazuh_password = read_wazuh_user_file()
-    create_rbac_db()
+    check_database_integrity()
     initial_users = db_users()
 
     # set a random password for all other users (not wazuh-wui)
@@ -60,4 +60,4 @@ if __name__ == "__main__":
                     str(id),
                 ],
                 password=custom_pass,
-            )
+            )