Skip to content

Conversation

nexusgoblin
Copy link
Contributor

…ml settings for webserver.paths.webroot and webserver.paths.webhome

What does this PR aim to accomplish?:

Attempt to address #5980

How does this PR accomplish the above?:

Update advanced/Scripts/update.sh to source utils.sh and build the ADMIN_INTERFACE_DIR variable from configuration in pihole.toml via the getFTLConfigValue() function. Also change a hard coded reference of /var/www/html/admin in output string to use the ADMIN_INTERFACE_DIR variable.

Update advanced/Scripts/updatecheck.sh to build an ADMIN_INTERFACE_DIR variable from configuration in pihole.toml via the getFTLConfigValue() function and change hard coded references to /var/www/html/admin to use the added ADMIN_INTERFACE_DIR variable.

Update automated install/uninstall.sh to source utils.sh and to build an ADMIN_INTERFACE_DIR variable from configuration in pihole.toml via the getFTLConfigValue() function. Add a check that if web UI path is not the default of /var/www/html/admin do not automatically delete the custom path, but tell user to delete manually. This is a bit of a work around to deal with potentially "unsafe" paths getting pulled from pihole.toml (and its a custom config, so possibly a fair ask).


By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code and I have tested my changes.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)
  6. I have checked that another pull request for this purpose does not exist.
  7. I have considered, and confirmed that this submission will be valuable to others.
  8. I accept that this submission may not be used, and the pull request closed at the will of the maintainer.
  9. I give this submission freely, and claim no ownership to its content.

  • I have read the above and my PR is ready for review. Check this box to confirm

@nexusgoblin nexusgoblin force-pushed the honour-webroot-webhome-settings branch 2 times, most recently from e88cb9d to 2bd17ac Compare March 27, 2025 13:39
@nexusgoblin nexusgoblin requested a review from PromoFaux March 28, 2025 12:28
@nexusgoblin nexusgoblin force-pushed the honour-webroot-webhome-settings branch from 2bd17ac to bc644b0 Compare March 30, 2025 05:02
…ml settings for webserver.paths.webroot and webserver.paths.webhome

When uninstalling, remove web interface parent directory empty check and possible removal.

Signed-off-by: James George <james.george@vigilantvoid.com>
@nexusgoblin nexusgoblin force-pushed the honour-webroot-webhome-settings branch from bc644b0 to 0f48239 Compare March 30, 2025 05:11
@nexusgoblin nexusgoblin requested a review from PromoFaux March 30, 2025 05:23
@PromoFaux PromoFaux merged commit bdcb6fc into pi-hole:development Apr 5, 2025
13 checks passed
@nexusgoblin nexusgoblin deleted the honour-webroot-webhome-settings branch April 5, 2025 01:50
@PromoFaux PromoFaux mentioned this pull request May 6, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants