Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-15 10:43:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
3428 commits 8 branches 109 tags 27 MiB
Commit graph

806 commits

Author SHA1 Message Date
Peter Robinson
45521b377a Use ip route rather than old net-tools route in chronometer.sh 
The only use of net-tools is the use of route in chronometer.sh so
instead use the same method as used in piholeDebug.sh to get the
default gateway so there's no need to depend on net-tools anylonger.

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
 2018-07-26 17:46:51 +01:00
Mcat12
03e5a78d8f
Merge remote-tracking branch 'origin/FTLDNS' into development 
# Conflicts:
#	advanced/Scripts/piholeDebug.sh
 2018-07-22 15:18:26 -04:00
Dan Schaper
ba7782f867
Space/Tab piholeDebug.sh 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-07-20 15:25:35 -07:00
Dan Schaper
c5091b0e49
Space/Tab wildcard_regex_converter.sh 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-07-20 14:00:34 -07:00
Dan Schaper
b54e32f0ca
Space/Tab webpage.sh 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-07-20 13:57:15 -07:00
Dan Schaper
328e7738d5
Space/Tab version.sh 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-07-20 13:27:30 -07:00
Dan Schaper
aca359c2e2
Space/Tab updatecheck.sh 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-07-20 13:24:05 -07:00
Dan Schaper
1cd40dc9e5
Space/Tab update.sh 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-07-20 13:22:37 -07:00
Dan Schaper
dc9407281f
Space/Tab setupLCD.sh 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-07-20 13:17:10 -07:00
Dan Schaper
8f727c1f35
Space/Tab query.sh 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-07-20 13:13:42 -07:00
Dan Schaper
a08ea28feb
Space/Tab piholeLogFlush.sh 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-07-20 13:07:54 -07:00
Dan Schaper
c5535dd9a0
Space/Tab piholeCheckout.sh 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-07-20 12:54:24 -07:00
Dan Schaper
3519cc5e44
Space/Tab list.sh 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-07-20 12:42:11 -07:00
Dan Schaper
d251bbbb05
Space/Tab chronometer.sh 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-07-20 12:29:09 -07:00
Dan Schaper
76c5b4a06b
Merge pull request #2118 from pi-hole/fix/debug-shellcheck 
fix some shellcheck/stickler compaints in debug script
 2018-07-19 05:18:40 -07:00
RamSet
56b04017e7 Port 53 check updated with 4 spaces. 
Signed-off-by: RamSet <RamSet@gmail.com>
 2018-07-16 11:29:12 -06:00
Mcat12
f8d4c36f6d
Add back --wild list.sh help and use -- for long params like --regex 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-15 18:59:25 -04:00
Dan Schaper
dbc82cfb6a
Merge pull request #2236 from pi-hole/new/regex-lists 
Use regex lists instead of wildcards for blocking
 2018-07-14 06:10:44 -07:00
Mcat12
941a766aa3
Replace -wild and -regex with --wild and --regex 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-12 21:38:43 -04:00
Mcat12
1b276a74fe
Display all lines of a list, even if there is no newline at the end 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-08 16:03:16 -04:00
Mcat12
8084c4b2a3
Fix regex period substitution due to switching to bashism 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-08 15:56:15 -04:00
Mcat12
1ca852191f
Fix stickler complaints 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-08 15:50:05 -04:00
Mcat12
af5fc6547a
Fix echoing wrong domain when converting wildcard 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-08 15:47:18 -04:00
Mcat12
70f2b26c86
Escape periods in wildcard converted regex filters. 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-08 15:45:06 -04:00
Mcat12
cfd95dbe87
Fix incorrect variable usage 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-08 15:38:44 -04:00
Mcat12
c5bb404d6a
Emulate wildcard blacklisting via -wild and move regex to -regex 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-08 14:37:33 -04:00
Mcat12
d21298c156
Add back conditional forwarding to webpage.sh 
This was accidentally removed in a previous PR.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-07 15:23:47 -04:00
Mcat12
4763969c8f
Move processWildcards to query.sh 
Closes #2255

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-06-30 22:03:53 -04:00
Mcat12
f868052062
Fix incorrect variable string substitution 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-06-30 15:50:43 -04:00
Mcat12
0f4968d75c
Merge remote-tracking branch 'origin/development' into new/regex-lists 2018-06-29 23:12:34 -04:00
Mcat12
3077c22e4f
Change help strings from wildcard to regex blacklist 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-06-29 23:10:49 -04:00
Mcat12
0decc37b5a
Appease stickler 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-06-29 22:55:00 -04:00
Mcat12
4a953b66e0
Make removing regex domains work correctly 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-06-29 22:51:37 -04:00
Mcat12
8435eeed4d
Don't validate regex domains 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-06-28 23:31:50 -04:00
Mcat12
cffb4de83b
Use strict grep instead of regex for duplicates 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-06-28 23:01:27 -04:00
Mcat12
868948509a
Split declaration and assignment of random_url 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-06-20 20:30:42 -04:00
Mark Drobnak
e71492a2b3
Update debug script for simple list format 
Gravity is now just a list of domains, not IP addresses and domains separated by a space.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-06-20 20:29:32 -04:00
DL6ER
2809579dd7
Refine regex filter generation 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-17 14:59:21 +02:00
DL6ER
c7afe3e9a4
Please stickler by making clear that the variable regexFile is declared outside of this routine 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-17 14:46:26 +02:00
DL6ER
cd026cd865
Add comment where regexList is defined 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-17 14:43:33 +02:00
DL6ER
bc705aac03
Add automated wildcard list -> regex filter conversion 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-17 14:39:19 +02:00
Rob Gill
23adbf9540
remove quotes 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-15 14:45:27 +10:00
Rob Gill
a7347238e6
$adListsList replace filename in text 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-15 14:42:30 +10:00
Rob Gill
bf55666492
Appease stickler. 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-13 16:29:07 +10:00
Rob Gill
8ab0b0e460
colfile 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-13 16:25:43 +10:00
Rob Gill
b8e1849cec
wildcardlist 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-13 16:19:07 +10:00
Rob Gill
45a8eda49b
Stop grep leak in query 
Fix grep error leak from #1805

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-13 16:08:21 +10:00
DL6ER
d254d6075a
First step from wildcards to regex lists for blocking 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-06 19:26:56 +02:00
Adam Warner
f5541860bc
Don't run the installer when doing ftl checkout, instead just run the ftl install functions 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-06-02 09:56:08 +01:00
Mark Drobnak
ab45360808
Merge pull request #1954 from ryanknapper/adlist.lists 
Prevent redundant entries from being added to Adlists.list
 2018-05-31 14:58:16 -04:00