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

Tidy up a few things in the readme and code. #1551

Merged
merged 2 commits into from
Mar 16, 2024
Merged

Conversation

PromoFaux
Copy link
Member

What does this PR aim to accomplish?:

Dipping my toes back into the water.

  • Tidy up a few things in the Readme file
    • Add some more comments to the example compose file
    • Add that setting the container's DNS to be itself is not recommended
  • Remove some commended out code from startup script
  • Move the webpassword checking section into ensure_basic_configuration
  • Ensure that FTL's dns.upstreams config is set (either in environment or config file) hard exit if not.

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)

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

Check that pihole-FTL is configured with upstream servers or it will not function!

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
@PromoFaux PromoFaux requested a review from a team March 10, 2024 19:34
Copy link
Member

@yubiuser yubiuser left a comment

Choose a reason for hiding this comment

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

Test need adjustment.

CMD_SETUP_WEB_PASSWORD = ". bash_functions.sh ; setup_web_password"

README.md Outdated Show resolved Hide resolved
README.md Show resolved Hide resolved
@PromoFaux
Copy link
Member Author

Test need adjustment.

Ah yes, maybe I will move back to its own function for easier testing.

@rdwebdesign
Copy link
Member

rdwebdesign commented Mar 10, 2024

This link in the Pi-hole features section is broken.

It is pointing to an old section:

Also, we should use a link to the repo main page (example: https://github.com/pi-hole/pi-hole#getting-in-touch-with-us), instead of the file contents (https://github.com/pi-hole/pi-hole/blob/master/README.md#getting-in-touch-with-us).

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
@DL6ER DL6ER mentioned this pull request Mar 12, 2024
5 tasks
@PromoFaux PromoFaux requested a review from yubiuser March 12, 2024 18:39
@PromoFaux PromoFaux merged commit cdded14 into development-v6 Mar 16, 2024
7 checks passed
@PromoFaux PromoFaux deleted the v6/basic-tweaks branch March 16, 2024 01:03
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

4 participants