Adam Warner
79b8dac0fa
Remove readonly attribute of the PI_HOLE_BIN_DIR declaration in pihole
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
5 years ago
Dan Schaper
03c65dd0e9
Convert hardcoded /usr/local/bin to variable
...
Update pihole script with full path to 'pihole'
Variable for webpage.sh 'pihole' call.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
5 years ago
DL6ER
251c9fee98
Simplify restarting code for "pihole restartdns". This fixes #2869 .
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
a4ba8d4b8f
Prevent double disabling/enabling by checking BLOCKING_ENABLED value in setupVars.conf
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
Ludovic Rousseau
d5fbe1b629
Do not ask admin password just for help documentation
...
It is not a good idea to ask for an admin password just to get the
command documentation.
"pihole -h" should return the arguments documentation with no need to
enter a password.
Without the patch I get:
$ ./pihole -h
Password:
It is easy to reproduce by invalidating the sudo password using
"sudo -k" before running pihole again.
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
6 years ago
Mcat12
3f59b51be1
Fix restartDNS returning code 1 even when it worked
...
If stdout was not a terminal (the `-t 1` check), `restartDNS` would
return code 1 in the success case. This caused the API to fail whenever
it tried to restart the DNS server.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
jeremysherriff
d986da63a5
Pass gravity exit code back to caller to allow for cron error handling
...
Signed-off-by: jeremysherriff <jeremysherriff@gmail.com>
6 years ago
Mark Drobnak
c976bbcfd2
Fix checkout error due to readonly variable
...
Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>
6 years ago
DL6ER
f20e4ddf3b
Change message for unknown state to something more useful
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
DL6ER
40656641b6
Merge branch 'development' into tweak/reload_on_enable_disable
6 years ago
DL6ER
0ebd68f17f
Review comments
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
DL6ER
337cc5ca18
BLOCKING -> BLOCKING_ENABLED
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
DL6ER
4e4d6b5d1f
Adjust "pihole status" command
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
DL6ER
b011adc453
Use new setupVars BLOCKING variable to determine which file to update via gravity
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
DL6ER
d8abc1d266
Storing BLOCKING=true/false in setupVars.conf
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
WaLLy3K
d163e38380
Ensure regex-blocked lines are red
...
* Add `regex.list` to seds list
Signed-off-by: WaLLy3K <wally3k@pihole.net>
6 years ago
DL6ER
20b946eae5
Instead of changing the dnsmasq configuration, we replace gravity.list and black.list by empty files for disabling. When pihole-FTL receives SIGHUP, it will clear its cache and reload all configured lists. If the files are empty, blocking will be disabled as no content to be blocked will be imported.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
DL6ER
c00357663b
Reload pihole-FTL instead of restart the entire service on "pihole enable/disable"
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
WaLLy3K
a1bf9fad98
Fix colour tail for use with new blocking methods
...
Signed-off-by: WaLLy3K <wally3k@pi-hole.net>
6 years ago
Dan Schaper
dbc82cfb6a
Merge pull request #2236 from pi-hole/new/regex-lists
...
Use regex lists instead of wildcards for blocking
6 years ago
Mcat12
941a766aa3
Replace -wild and -regex with --wild and --regex
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
c5bb404d6a
Emulate wildcard blacklisting via -wild and move regex to -regex
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
4763969c8f
Move processWildcards to query.sh
...
Closes #2255
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
0f4968d75c
Merge remote-tracking branch 'origin/development' into new/regex-lists
6 years ago
Mcat12
3077c22e4f
Change help strings from wildcard to regex blacklist
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
DL6ER
a7c73036f0
pihole -t: Warn user if Pi-hole's logging is disabled
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
Rob Gill
2255d05664
Remove scanlist(), now in query.sh
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
b1207949ac
Call query.sh to replace queryFunc()
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
40bc390c3b
Admin Console -> "Web Interface"
...
User facing --help text changes
Admin Console --> Web Interface
and additional branch option
Signed-Off-By: Rob Gill <rrobgill@protonmail.com>
6 years ago
RamSet
2f24e5ceb7
Minor correction for double instance of the word "found".
...
Signed-off-by: RamSet <RamSet@gmail.com>
6 years ago
Adam Warner
e49a9096a5
accidentally a 'shift'
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
33148ba832
Add help text to pihole command to document new flag
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
bca23dd896
Allow passing of --check-only to update script.
...
Don't run installer for updating web files, it's handled by getGitFiles.
I think this works...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
310d33b8ee
Merge dev > FTLDNS fix merge conflicts
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Razvan Radu
7361d5d3ea
Update pihole lolcahost probe for DNS status
...
Signed-off-by: Razvan Radu <ramset@gmail.com>
6 years ago
Adam Warner
0b87f489d5
Look for pihole-FTL, not dnsmasq!
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
DL6ER
7ed45d26c2
Remove " " at some places where they shouldn't be
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
DL6ER
e8ec0dc701
Use pihole-FTL resolver in pihole and gravity
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
DL6ER
d7dde06552
Add "pihole logging off noflush" command
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
DL6ER
05d015169c
Check for local version and branches every 10 minutes, check for remote versions only once a day
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
7 years ago
Jacob Salmela
9631519eb1
Merge pull request #1752 from pi-hole/new/bashupdatechecker
...
Add bash / cron based update checker for Pi-hole
7 years ago
DL6ER
6ca47dc3b3
Add bash / cron based update checker for Pi-hole
7 years ago
Mcat12
8dba2a88e2
Move FTL re-parsing call after dnsmasq restart
7 years ago
DL6ER
b9ae01d819
Send SIGHUP to pihole-FTL when restarting/reloading dnsmasq
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
7 years ago
WaLLy3K
645d8e0ebd
Fix issue where wildcarding didn't restart dnsmasq
...
Signed off by WaLLy3K <wally3k@pi-hole.net>
7 years ago
WaLLy3K
80c40e6050
Prevent full stop being interpreted as regex
...
Signed off by WaLLy3K <wally3k@pi-hole.net>
7 years ago
WaLLy3K
3b300a4d6a
Fix query option handling
...
Signed off by WaLLy3K <wally3k@pi-hole.net>
7 years ago
WaLLy3K
664d0ea023
Correctly retrieve IPv4/6 addresses for tailFunc()
...
* Add comments for readability
* Use `sed -E` for readability
* Move `date` into `sed`
* Use updated colour codes
7 years ago
Adam Warner
a0bd517380
Merge pull request #1694 from pi-hole/fix/qf-opt
...
Slow query fix & queryFunc optimisation
7 years ago
WaLLy3K
56990618e9
Prevent Block Page issue
...
* Block Page expects to see a full stop, otherwise it will throw an unhandled error
7 years ago