Dan Schaper
c9f3c02cb7
Merge pull request #2027 from ravron/ravron-urls-in-query-strings
...
Prevent inadvertent blocking of good domains appearing in query strings
7 years ago
Mark Drobnak
d4870b3854
Merge pull request #2053 from pi-hole/tweak/debug-logs
...
Get head and tail of pihole-FTL.log during debug process
7 years ago
Adam Warner
36d9af10f0
Merge pull request #2108 from LudovicRousseau/fix_No_such_file_or_directory
...
Fix sed: can't read /etc/pihole/pihole-FTL.conf: No such file or directory
7 years ago
Dan Schaper
0c8fcbc684
Merge pull request #2105 from pi-hole/feature/self_dco
...
Do not require DCO for Pi-hole Org members with GPG signed commits.
7 years ago
Ludovic Rousseau
7edab27e53
Stylistic change to use an explicit if/then/fi
...
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
7 years ago
Ludovic Rousseau
9b3531f634
Fix stylistic issue
...
Expand variable using ${FTLconf}
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
7 years ago
Ludovic Rousseau
d8f85a8981
Avoid a "No such file or directory" error
...
Check the file /etc/pihole/pihole-FTL.conf exists before trying to use
it.
without the patch I get, each day, in my logs:
sed: can't read /etc/pihole/pihole-FTL.conf: No such file or directory
I use a variable FTLconf to not repeat the file name twice.
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
7 years ago
Ludovic Rousseau
3b229489c2
Fix regex to find DBFILE= from configuration file
...
The regex ^\s^.DBFILE\s*=\s* does not work to match "DBFILE="
I don't know what the second '^' is used for.
With the change I now have the results:
DBFILE=/foo/bar
-> /foo/bar
DBFILE=/foo/bar
-> /foo/bar
# DBFILE=/foo/bar
-> /etc/pihole/pihole-FTL.db
xDBFILE=/foo/bar
-> /etc/pihole/pihole-FTL.db
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
7 years ago
Mark Drobnak
c2fcbbb0c6
Merge pull request #2090 from Razvici/master
...
Update pihole locahost probe for DNS status
7 years ago
Dan Schaper
952f1271b4
Do not require DCO for Pi-hole Org members with GPG signed commits.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
7 years ago
Mark Drobnak
331472b592
Merge pull request #1999 from pi-hole/tweak/RedundantInstallCode
...
adlists.default no longer used. No need to reference it.
7 years ago
Razvan Radu
7361d5d3ea
Update pihole lolcahost probe for DNS status
...
Signed-off-by: Razvan Radu <ramset@gmail.com>
7 years ago
Jacob Salmela
fbee18e24d
Merge pull request #2056 from pi-hole/release/v3.3.1
...
Pi-hole core v3.3.1
7 years ago
Mark Drobnak
1200a77b22
Merge pull request #2075 from everettsouthwick/development
...
Add support for public Cloudflare DNS servers.
7 years ago
Mark Drobnak
bb9a18ef08
Merge pull request #1987 from ryanknapper/patch-1
...
Proper output for debug CPU detection
7 years ago
Everett Southwick
a8b493cb7d
Add support for public Cloudflare DNS servers.
...
Signed-off-by: Everett Southwick <everett@everettsouthwick.com>
7 years ago
Mark Drobnak
971e6f2664
Merge pull request #2064 from Perflyst/chronometer-1
...
Add RaspberryPi 3B+ to Chronometer
7 years ago
Mark Drobnak
a1d6ef04ec
Merge pull request #1758 from mettacrawler/fix-for-RHELish-ifcfg
...
basic-install.sh - no CIDR in ifcfg-*
7 years ago
Dan Schaper
a97e361661
Merge pull request #2061 from dflamand/development
...
Remove dead link from CONTRIBUTING.md
7 years ago
Dan Schaper
34d84522dd
Merge pull request #2054 from theLMGN/patch-1
...
Link to the admin panel on the splash page.
7 years ago
Perflyst
3390fbf238
Add RaspberryPi 3B+
...
Signed-off-by: Perflyst <mail@perflyst.de>
7 years ago
Mark Drobnak
98ad1feaeb
Merge pull request #2060 from pi-hole/tweak/debug-xheader
...
add label to x-header so you know which one is being evaluated
7 years ago
Dillon Flamand
37e8a91d5b
Remove dead link from CONTRIBUTING.md
...
Removed a link to a github repo that no longer exists.
Signed-off-by: D. Flamand <dflamand@users.noreply.github.com>
7 years ago
Jacob Salmela
68c27eb2a1
add label to x-header so you know which one is being evaluated
...
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
7 years ago
Mark Drobnak
d31a498e6c
Merge pull request #2031 from pi-hole/tweak/BegonePullApprove
...
Remove PA YAML file
7 years ago
Leo MG Nesfield (LMGN)
bfcbd72e4b
Link to the admin panel on the splash page.
7 years ago
Jacob Salmela
d9d3caec22
new head tail function and get head tail of pihole-FTL.log instead of just head
...
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
7 years ago
Jacob Salmela
7159ecb632
reduce ping times for faster script completion
...
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
7 years ago
Mark Drobnak
e131395cce
Merge pull request #2037 from justinamcafee/master
...
Adds FamilyShield DNS server address to the "Choose DNS" screen in installer.
7 years ago
justinamcafee
30af6e73be
added ;; to line 825
...
Misformated case. Updated correct case
7 years ago
justinamcafee
2895b9bfb7
Added support for FamilyShield from OpenDNS
...
With a very minor code change, individuals can now implement restrictions on dangers, disturbing, or otherwise adult oriented content without the need for managed restrictions.
This is a fairly non-invasive change and will benefit users who intend to use VPN for home or small business uses where access to such material may be undesirable.
7 years ago
Adam Warner
71d8f5f96f
remove PA YAML file
...
Signed-off-by: Adam Warner <adamw@rner.email>
7 years ago
Adam Warner
856a2096eb
Merge pull request #2030 from pi-hole/new/StickFTLCheckoutBranch
...
Store checked out FTL branch in /etc/pihole/ftlbranch
7 years ago
Adam Warner
76cb129d3c
don't forget `master` and `development` branches!
...
Signed-off-by: Adam Warner <adamw@rner.email>
7 years ago
Adam Warner
246d5cd587
store checked out FTL branch in /etc/pihole/ftlbranch
...
Signed-off-by: Adam Warner <adamw@rner.email>
7 years ago
Riley Avron
f390671018
Improve scheme matching to avoid inadvertent blocking
...
Signed-off-by: Riley Avron <riley.avron@gmail.com>
7 years ago
Riley Avron
512ec7fb87
Remove unneeded ifs in awk
...
Signed-off-by: Riley Avron <riley.avron@gmail.com>
7 years ago
Adam Warner
aed20cf7c6
Merge pull request #2017 from pi-hole/fix/NoWhitelistGravity
...
Gravity falls over when there is no whitelist file
7 years ago
Adam Warner
ad1f210528
As we no longer add source lists to the whitelist by default, gravity falls over on new installs.
...
Signed-off-by: Adam Warner <adamw@rner.email>
7 years ago
Mark Drobnak
e3e5e016d5
Merge pull request #2016 from pi-hole/bugfix/mktemp
...
Bugfix mktmp > mktemp
7 years ago
Dan Schaper
3425b9a82e
Fix mktmp > mktemp
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
7 years ago
Dan Schaper
6011dd7372
Merge pull request #2000 from pi-hole/fix/FTL_Install
...
Use pushd/popd and create random temporary directory
7 years ago
Dan Schaper
41d9d57c84
Merge pull request #1996 from pi-hole/fix/AlternativeWhitelistFromWebFix
...
Specifty `LC_ALL=C` when dealing with sorted lists.
7 years ago
Dan Schaper
4606693e62
Use pushd/popd and create random temporary directory to prevent potential backdoor binary injection.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
7 years ago
Adam Warner
e61d8e4fb8
adlists.default no longer used. No need to reference it.
...
Use --force switch of gravity to force the cache refresh
Signed-off-by: Adam Warner <adamw@rner.email>
7 years ago
Adam Warner
6b4685b333
much more elegant to export LC_ALL at the beginning of the script!
...
Signed-off-by: Adam Warner <adamw@rner.email>
7 years ago
Adam Warner
d4ac818a0b
Specifty `LC_ALL=C` when dealing with sorted lists.
...
Signed-off-by: Adam Warner <adamw@rner.email>
7 years ago
Ryan Knapper
c17d95bfed
Proper output for debug CPU detection
...
Inserted "log_write" to properly output CPU detection lines.
Signed-off-by: Ryan Knapper (ryanknapper@gmail.com>
7 years ago
Mark Drobnak
f14184df30
Merge pull request #1982 from LudovicRousseau/master
...
Create blacklist.txt if not existant
7 years ago
Ludovic Rousseau
47bbea9ba7
Use " " to protect parameter substitution
...
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
7 years ago