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

Fix 4.9 package generation #296

Merged
merged 6 commits into from
Sep 6, 2024
Merged

Fix 4.9 package generation #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d0ffc6f
Fix deb generation
Tostti Sep 6, 2024
978f860
Fix rpm generation
Tostti Sep 6, 2024
25dac90
Add environment variable
Tostti Sep 6, 2024
014d021
Remove unnecessary flag
Tostti Sep 6, 2024
e9fe4de
Fix configuration file
Tostti Sep 6, 2024
000995b
Merge branch '4.9.0' into bug/295-add-os-path-conf-environment-variable
Tostti Sep 6, 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
7 changes: 4 additions & 3 deletions config/opensearch_dashboards.prod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
server.host: 0.0.0.0
server.port: 443
opensearch.hosts: https://localhost:9200
opensearch.hosts: https://127.0.0.1:9200
opensearch.ssl.verificationMode: certificate
opensearch.requestHeadersAllowlist: ["securitytenant","Authorization"]
opensearch_security.multitenancy.enabled: false
opensearch_security.readonly_mode.roles: ["kibana_read_only"]
server.ssl.enabled: true
server.ssl.key: "/etc/wazuh-dashboard/certs/dashboard-key.pem"
server.ssl.certificate: "/etc/wazuh-dashboard/certs/dashboard.pem"
server.ssl.key: "/etc/wazuh-dashboard/certs/wazuh-dashboard-key.pem"
server.ssl.certificate: "/etc/wazuh-dashboard/certs/wazuh-dashboard.pem"
opensearch.ssl.certificateAuthorities: ["/etc/wazuh-dashboard/certs/root-ca.pem"]
uiSettings.overrides.defaultRoute: /app/wz-home
opensearch_security.cookie.secure: true
1 change: 1 addition & 0 deletions dev-tools/build-packages/config/default
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ chdir="/"
nice=""
KILL_ON_STOP_TIMEOUT=0

OSD_PATH_CONF="/etc/wazuh-dashboard"
2 changes: 1 addition & 1 deletion dev-tools/build-packages/config/wazuh-dashboard.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ User=wazuh-dashboard
Group=wazuh-dashboard
EnvironmentFile=-/etc/default/wazuh-dashboard
EnvironmentFile=-/etc/sysconfig/wazuh-dashboard
ExecStart=/usr/share/wazuh-dashboard/bin/opensearch-dashboards -c "/etc/wazuh-dashboard/opensearch_dashboards.yml"
ExecStart=/usr/share/wazuh-dashboard/bin/opensearch-dashboards
WorkingDirectory=/usr/share/wazuh-dashboard

[Install]
Expand Down
4 changes: 4 additions & 0 deletions dev-tools/build-packages/deb/debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ override_dh_install:
useradd -g $(GROUP) $(USER)

tar -xf $(DASHBOARD_FILE)
sed -i 's/OSD_NODE_OPTS_PREFIX/OSD_PATH_CONF="\/etc\/wazuh-dashboard" OSD_NODE_OPTS_PREFIX/g' "wazuh-dashboard-base/bin/opensearch-dashboards"
sed -i 's/OSD_USE_NODE_JS_FILE_PATH/OSD_PATH_CONF="\/etc\/wazuh-dashboard" OSD_USE_NODE_JS_FILE_PATH/g' "wazuh-dashboard-base/bin/opensearch-dashboards-keystore"


mkdir -p $(TARGET_DIR)$(CONFIG_DIR)
mkdir -p $(TARGET_DIR)$(INSTALLATION_DIR)
Expand Down Expand Up @@ -95,6 +98,7 @@ override_dh_fixperms:
chmod 440 $(TARGET_DIR)$(INSTALLATION_DIR)/VERSION
chmod 750 $(TARGET_DIR)/etc/systemd/system/wazuh-dashboard
chmod 750 $(TARGET_DIR)/etc/default/wazuh-dashboard
chmod 640 "$(TARGET_DIR)$(CONFIG_DIR)"/opensearch_dashboards.yml
chmod 640 "$(TARGET_DIR)$(CONFIG_DIR)"/node.options
chmod 640 $(TARGET_DIR)/etc/systemd/system/wazuh-dashboard.service
find "$(TARGET_DIR)$(INSTALLATION_DIR)" -type d -exec chmod 750 {} \;
Expand Down
3 changes: 3 additions & 0 deletions dev-tools/build-packages/rpm/wazuh-dashboard.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ useradd -g %{GROUP} %{USER}
%build

tar -xf %{DASHBOARD_FILE}
sed -i 's/OSD_NODE_OPTS_PREFIX/OSD_PATH_CONF="\/etc\/wazuh-dashboard" OSD_NODE_OPTS_PREFIX/g' "wazuh-dashboard-base/bin/opensearch-dashboards"
sed -i 's/OSD_USE_NODE_JS_FILE_PATH/OSD_PATH_CONF="\/etc\/wazuh-dashboard" OSD_USE_NODE_JS_FILE_PATH/g' "wazuh-dashboard-base/bin/opensearch-dashboards-keystore"


# -----------------------------------------------------------------------------

Expand Down
Loading