Commit Graph

1119 Commits (c330df9700d7d82e56ee00b6caf02d1494184ae2)

Author SHA1 Message Date
Dan Schaper a986f53134
Merge pull request #2436 from pi-hole/fix/password-read-error
6 years ago
Dan Schaper 72829be281
Remove shellcheck overrides
6 years ago
Adam Warner d57f9906bd
read -r -a, not read -a -r
6 years ago
Adam Warner 3d4fea6510
Move -r to before the -p
6 years ago
Mark Drobnak a301d4381f
Merge pull request #2472 from pi-hole/fix-webpwexpansion
6 years ago
Mark Drobnak 49b8ad7e94
Merge pull request #2470 from jeremysherriff/patch-1
6 years ago
WaLLy3K 180d29c7b3
Prevent BASH from expanding Web Password
6 years ago
Mark Drobnak a23ba91681
Merge pull request #2468 from gstrauss/lighttpd-conf-enhancements
6 years ago
jeremysherriff d3ac8bb6f8 Silence updateGravity job unless errors occur
6 years ago
Mark Drobnak f87f3b9199
Merge pull request #2467 from pi-hole/fix/dnsmasq-license
6 years ago
Glenn Strauss 67bdcbcf19 lighttpd: slightly more efficient sample config
6 years ago
Glenn Strauss 69b2a5a876 lighttpd: use file glob for optional external.conf
6 years ago
WaLLy3K 7f92671765
Update dnsmasq config license
6 years ago
Mark Drobnak 85dceb12a1
Use curl -s instead of -q
6 years ago
Mcat12 d55012f724
Append versions (after the first) instead of overwriting in updatecheck
6 years ago
Mcat12 7c6eecc9c8
Ignore shellcheck warning
6 years ago
Mcat12 e4cbf5023a
Fix error when reading in new password
6 years ago
Mark Drobnak 46356d3027
Merge pull request #2434 from pi-hole/fix/2200
6 years ago
Mark Drobnak 958a263437
Merge pull request #2431 from pi-hole/fix/use_PHP_comments_in_pihole-FTL.conf_template
6 years ago
Mark Drobnak a89ae82270
Merge pull request #2430 from pi-hole/chrono-lc-all
6 years ago
Mark Drobnak cedc39bf09
Merge pull request #2426 from mrmajik45/master
6 years ago
Adam Warner 0627e68078
Shellcheck is not a fan of sourcing scripts it does not know about. Add Directive to stop shellcheck from checking this.
6 years ago
Adam Warner 7d78f6314a
Source Setupvars file and only check local/remote Web branch/version if the web interface is installed.
6 years ago
mrmajik45 0f509f4a34
Update piholeDebug.sh
6 years ago
DL6ER b043000044
Improve template by removing it. PHP cannot digest comments starting in "#" as of v7.0.0
6 years ago
DL6ER c338eab3c6
According to the PHP documentation, PHP 7.0.0+ does not longer recognize hash marks (#) as comments. As FTL has been trained to understand PHP-style (comment lines start with ";") as well, we switch to using them.
6 years ago
WaLLy3K 24e1dc92ba
Resolve issue #2428
6 years ago
mrmajik45 00f98543ad
read without -r will mangle backslashes.
6 years ago
mrmajik45 8684356b44
read without -r will mangle backslashes.
6 years ago
Mark Drobnak dac27f1f18
Only get the first gateway for chronometer
6 years ago
Mark Drobnak 6f276ae4bb
Merge pull request #2299 from nullr0ute/net-tools
6 years ago
Mark Drobnak ec29829550
Merge pull request #2388 from Sh4d1/ipv6_brackets
6 years ago
DL6ER 40656641b6
Merge branch 'development' into tweak/reload_on_enable_disable
6 years ago
DL6ER 45bf4b02e7
Ensure that when pihole-FTL is launched as user root, it will drop permissions as soon as this is possible. We tell pihole-FTL to change UID/GID to pihole:pihole instead of the default nobody:nogroup. This default causes conflicts with our SQLite3 database. See that corresponding pull request for further details.
6 years ago
Patrik Cyvoct 85cf98888d
Merge remote-tracking branch 'origin/development' into ipv6_brackets
6 years ago
Patrik Cyvoct 048e5bb9a2
Remove external ipv6 brackets if any in servername
6 years ago
DL6ER b9d47d0dd2
Merge pull request #2378 from pi-hole/fix/pihole-FTL-no-caps
6 years ago
DL6ER 940c9c3bae
Merge pull request #2383 from pi-hole/feature/privacy-level-4
6 years ago
Mcat12 f141b9f778
Add support for privacy level 4
6 years ago
DL6ER 1dca1efbc6
Don't use extra query logging
6 years ago
DL6ER ec2426b24d
Add clarifying comments
6 years ago
DL6ER 5cd3b11391
Start pihole-FTL as root if capabilities are not supported by the system
6 years ago
DL6ER d30b565d98
Touch dhcp.leases to ensure it exists. There are some systems out there where the installer didn't finish on the first run and some users don't have this file being created. Although /etc/pihole should be owned by pihole:pihole, pihole-FTL sometimes fails to open this file and - if this is the case and DHCP is enabled - refuses to start altogether.
6 years ago
DL6ER ca309d3b28
Restart pihole-FTL after log flushing to force reloading history. Fixes #2339
6 years ago
DL6ER 165affc39b
list.sh writes into blacklist.txt not black.list so does not need to account for a possibly changed list location
6 years ago
DL6ER f794018e0c
Acknowledge temporary file if disabled for "pihole -b" command
6 years ago
DL6ER 94e4ed6644
Add facility to add multiple audit list entries at once and to nuke audit list
6 years ago
WaLLy3K eef948d797
Fix header newlines
6 years ago
Mcat12 e4e22fb58e
Fix permissive regex
6 years ago
Mcat12 7086a400e8
Use simpler regex format for wildcards
6 years ago