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.

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

adds selection for web root and admin interface subdirectory #5590

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

Gezzo42
Copy link

@Gezzo42 Gezzo42 commented Feb 25, 2024

  • temporary changes GitHub repository

Thank you for your contribution to the Pi-hole Community!

Please read the comments below to help us consider your Pull Request.

We are all volunteers and completing the process outlined will help us review your commits quicker.

Please make sure you

  1. Base your code and PRs against the repositories developmental branch.
  2. Sign Off all commits as we enforce the DCO for all contributions
  3. Sign all your commits as they must have verified signatures
  4. File a pull request for any change that requires changes to our documentation at our documentation repo

What does this PR aim to accomplish?:

Pihole should be able to install the web interface at a different location than /var/www/html/admin, like /var/www/html/pihole.

How does this PR accomplish the above?:

I changed the hard coded paths for /var/www/html and admin in the pihole scripts with the two additional variables WEB_ROOT and ADMIN_INTERFACE_SUBDIR. They are set to the current values as default and a added dialog allows to change them. Also a single adaption to the pihole web repository was necessary, which later needs also a pull request.
At the moment the adaptions to the tests are missing and I also changed the Github links to test this.

Can you please give me some feedback, if my current implementation is OK or what needs to be changed!? Also help/hints for the tests would be nice.

Link documentation PRs if any are needed to support this PR:


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

* temporary changes GitHub repository

Signed-off-by: Gezzo42 <[email protected]>
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.

None yet

1 participant