Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Restore AIX packages and purge Alpine references #7729

Merged
merged 2 commits into from
Sep 4, 2024
Merged

Restore AIX packages and purge Alpine references #7729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23465e3
fix: Revert Remove AIX PowerPC reference
vikman90 Sep 3, 2024
fd4d91f
docs: remove reference to Alpine Linux in packages list
vikman90 Sep 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions source/_templates/installations/wazuh/apk/add_repository.rst
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions source/_templates/installations/wazuh/apk/disabling_repository.rst
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions source/_templates/installations/wazuh/apk/uninstall_wazuh_agent.rst
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions source/_templates/installations/wazuh/common/enable_wazuh_agent_service.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@

.. group-tab:: No service manager

On some systems, like Alpine Linux, you need to start the agent manually:
On some systems, you need to start the agent manually:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If not Alpine, what systems? Too vague. We should clarify or remove altogether.


.. code-block:: console

# /var/ossec/bin/wazuh-control start

.. End of include file
.. End of include file
27 changes: 3 additions & 24 deletions source/_variables/replacements.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#
# Custom replacements
#
# This file contains the dictionary of custom replacements. Requires the
# variables 'version', 'release' and 'is_latest_release' from
# This file contains the dictionary of custom replacements. Requires the
# variables 'version', 'release' and 'is_latest_release' from
# source/_variables/settings.py
#

Expand All @@ -16,18 +16,6 @@
custom_replacements = {
# === URLs and base URLs
"|CHECKSUMS_URL|" : "https://packages.wazuh.com/4.x/checksums/wazuh/",
"|APK_CHECKSUMS_I386_URL|" : "alpine/x86",
"|APK_CHECKSUMS_X86_64_URL|" : "alpine/x86_64",
"|APK_CHECKSUMS_AARCH64_URL|" : "alpine/aarch64",
"|APK_CHECKSUMS_ARMV7_URL|" : "alpine/armv7",
"|APK_CHECKSUMS_ARMHF_URL|" : "alpine/armhf",
"|APK_CHECKSUMS_PPC_URL|" : "alpine/ppc64le",
"|APK_AGENT_I386_URL|" : "https://packages.wazuh.com/4.x/alpine/v3.12/main/x86/wazuh-agent",
"|APK_AGENT_X86_64_URL|" : "https://packages.wazuh.com/4.x/alpine/v3.12/main/x86_64/wazuh-agent",
"|APK_AGENT_AARCH64_URL|" : "https://packages.wazuh.com/4.x/alpine/v3.12/main/aarch64/wazuh-agent",
"|APK_AGENT_ARMV7_URL|" : "https://packages.wazuh.com/4.x/alpine/v3.12/main/armv7/wazuh-agent",
"|APK_AGENT_ARMHF_URL|" : "https://packages.wazuh.com/4.x/alpine/v3.12/main/armhf/wazuh-agent",
"|APK_AGENT_PPC_URL|" : "https://packages.wazuh.com/4.x/alpine/v3.12/main/ppc64le/wazuh-agent",
"|RPM_AGENT_URL|" : "https://packages.wazuh.com/4.x/yum/wazuh-agent",
"|RPM_MANAGER_URL|" : "https://packages.wazuh.com/4.x/yum/wazuh-manager",
"|DEB_AGENT_URL|" : "https://packages.wazuh.com/4.x/apt/pool/main/w/wazuh-agent/wazuh-agent",
Expand All @@ -43,13 +31,6 @@
"|PYTHON_CLOUD_CONTAINERS_MAX|": "3.11",

# --- Revision numbers for Wazuh agent and manager packages versions
# Alpine APK packages revisions
"|WAZUH_REVISION_APK_AGENT_I386|" : "r1",
"|WAZUH_REVISION_APK_AGENT_X86_64|" : "r1",
"|WAZUH_REVISION_APK_AGENT_AARCH64|" : "r1",
"|WAZUH_REVISION_APK_AGENT_ARMV7|" : "r1",
"|WAZUH_REVISION_APK_AGENT_ARMHF|" : "r1",
"|WAZUH_REVISION_APK_AGENT_PPC|" : "r1",
# Yum packages revisions
"|WAZUH_REVISION_YUM_AGENT_I386|" : "1",
"|WAZUH_REVISION_YUM_MANAGER_I386|" : "1",
Expand All @@ -75,7 +56,7 @@
"|WAZUH_REVISION_DEB_AGENT_ARMHF|" : "1",
"|WAZUH_REVISION_DEB_MANAGER_ARMHF|" : "1",
"|WAZUH_REVISION_DEB_AGENT_PPC|" : "1",
#"|WAZUH_REVISION_DEB_MANAGER_PPC|" :
#"|WAZUH_REVISION_DEB_MANAGER_PPC|" :
#
# === Wazuh indexer version revisions
"|WAZUH_INDEXER_CURRENT_REV|" : "1", # RPM and Deb
Expand Down Expand Up @@ -196,7 +177,6 @@
custom_replacements["|WAZUH_AGENT_RPM_PKG_INSTALL|"] = ''
custom_replacements["|WAZUH_AGENT_DEB_PKG_INSTALL|"] = ''
custom_replacements["|WAZUH_AGENT_ZYPP_PKG_INSTALL|"] = ''
custom_replacements["|WAZUH_AGENT_APK_PKG_INSTALL|"] = ''
else:
custom_replacements["|WAZUH_INDEXER_RPM_PKG_INSTALL|"] = '-' + custom_replacements["|WAZUH_CURRENT|"] + '-' + custom_replacements["|WAZUH_INDEXER_CURRENT_REV|"]
custom_replacements["|WAZUH_MANAGER_RPM_PKG_INSTALL|"] = '-' + custom_replacements["|WAZUH_CURRENT|"] + '-' + custom_replacements["|WAZUH_REVISION_YUM_MANAGER_X86|"]
Expand All @@ -207,4 +187,3 @@
custom_replacements["|WAZUH_AGENT_RPM_PKG_INSTALL|"] = '-' + custom_replacements["|WAZUH_CURRENT|"] + '-' + custom_replacements["|WAZUH_REVISION_YUM_AGENT_X86|"]
custom_replacements["|WAZUH_AGENT_DEB_PKG_INSTALL|"] = '=' + custom_replacements["|WAZUH_CURRENT|"] + '-' + custom_replacements["|WAZUH_REVISION_DEB_AGENT_X86|"]
custom_replacements["|WAZUH_AGENT_ZYPP_PKG_INSTALL|"] = '-' + custom_replacements["|WAZUH_CURRENT|"] + '-' + '1'
custom_replacements["|WAZUH_AGENT_APK_PKG_INSTALL|"] = '=' + custom_replacements["|WAZUH_CURRENT|"] + '-' + custom_replacements["|WAZUH_REVISION_APK_AGENT_X86_64|"]
Loading