Skip to content

webui: use WEB_UI path in apache bareos-webui.conf file#2201

Merged
BareosBot merged 3 commits intobareos:masterfrom
Nico54g:patch-1
Mar 24, 2025
Merged

webui: use WEB_UI path in apache bareos-webui.conf file#2201
BareosBot merged 3 commits intobareos:masterfrom
Nico54g:patch-1

Conversation

@Nico54g
Copy link
Contributor

@Nico54g Nico54g commented Mar 4, 2025

When i compile a new version of Bareos, the webui don't start because the path of installed webui doesn't respect the CMAKE_INSTALL_DIR which is absent in apache configuration file bareos-webui.conf.

This PR propose to have the file modified by cmake

lignes added in the file : webui/CMakeLists.txt

104   set(WEBUI_DIR ${CMAKE_INSTALL_FULL_DATAROOTDIR}/bareos-webui)
105   configure_file(
106       install/apache/bareos-webui.conf.in
107       ${CMAKE_CURRENT_SOURCE_DIR}/install/apache/bareos-webui.conf @ONLY
108   )

file webui/install/apache/bareos-webui.conf renamed bareos-webui.conf.in
and modified :

12   Alias /bareos-webui  @WEBUI_DIR@/public
13
14   <Directory @WEBUI_DIR@/public>

Thank you for contributing to the Bareos Project!

Please check

  • Short description and the purpose of this PR is present above this paragraph
  • Your name is present in the AUTHORS file (optional)

If you have any questions or problems, please give a comment in the PR.

Helpful documentation and best practices

Checklist for the reviewer of the PR (will be processed by the Bareos team)

Make sure you check/merge the PR using devtools/pr-tool to have some simple automated checks run and a proper changelog record added.

General
  • Is the PR title usable as CHANGELOG entry?
  • Purpose of the PR is understood
  • Commit descriptions are understandable and well formatted
  • Required backport PRs have been created
  • Correct milestone is set
Source code quality
  • Source code changes are understandable
  • Variable and function names are meaningful
  • Code comments are correct (logically and spelling)
  • Required documentation changes are present and part of the PR

@sebsura sebsura changed the title compil : Add path in config file of apache webui: add path in config file of apache Mar 10, 2025
@bruno-at-bareos bruno-at-bareos self-assigned this Mar 24, 2025
@bruno-at-bareos bruno-at-bareos self-requested a review March 24, 2025 10:19
@bruno-at-bareos bruno-at-bareos added this to the 25.0.0 milestone Mar 24, 2025
@bruno-at-bareos bruno-at-bareos changed the title webui: add path in config file of apache webui: use WEB_UI path in apache bareos-webui.conf file Mar 24, 2025
Nico54g added 2 commits March 24, 2025 14:10
- create `bareos-webui.conf.in` and set cmake variables
- untrack and delete generated `baros-webui.conf`
- add generated `bareos-webui.conf` to `.gitignore`
- redo align to 4 spaces
- add `bareos-webui.conf.in`
- update coypright year
Copy link
Contributor

@bruno-at-bareos bruno-at-bareos left a comment

Choose a reason for hiding this comment

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

Thanks a lot for the proposal.
Accepted as tested and reviewed

@BareosBot BareosBot merged commit 2b1c6d2 into bareos:master Mar 24, 2025
1 check was pending
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants