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

DietPi-Software | Pi-hole: Allow user choice whether to show blocking page #2201

Merged
merged 3 commits into from
Oct 30, 2018

Conversation

MichaIng
Copy link
Owner

@MichaIng MichaIng commented Oct 30, 2018

Status: Ready
🈯️ Test on Stretch VM, install + blocking page

  • As fine tuning we could add a webserver conf.d setting that contains the blocking and admin page specific additions from Pi-hole's default lighttpd.conf: https://github.com/pi-hole/pi-hole/blob/master/advanced/lighttpd.conf.debian
    But for consistency needs port to Apache+Nginx then as well 🤔.
  • Edit online docs, when merged, since admin page is only available via domain.org/admin then. domain.org/pihole contains the blocking page + css files. Although directly accessing /pihole at least serves a direct link to admin page 😉.

Reference: https://github.com/Fourdee/DietPi/issues/2007

Commit list/description:

  • DietPi-Software | Pi-hole: Allow user choice whether to show blocking page
  • DietPi-Software | Pi-hole: Code clean-up
  • CHANGELOG | Pi-hole blocking page support
  • DietPi-Software | Pi-hole: Minor info

+ DietPi-Software | Pi-hole: Allow user choice whether to show blocking page
+ DietPi-Software | Pi-hole: Code clean-up
@MichaIng MichaIng added this to the v6.18 milestone Oct 30, 2018
@MichaIng MichaIng self-assigned this Oct 30, 2018
@MichaIng MichaIng requested a review from Fourdee October 30, 2018 02:03
+ CHANGELOG | Pi-hole blocking page support
+ DietPi-Software | Pi-hole: Minor info
@Fourdee
Copy link
Collaborator

Fourdee commented Oct 30, 2018

@MichaIng

Legend 👍

Looks good, will merge for testing.

@Fourdee Fourdee merged commit 5798ee4 into dev Oct 30, 2018
@MichaIng MichaIng deleted the pihole branch October 30, 2018 16:48
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.

2 participants