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
3659 commits 8 branches 109 tags 27 MiB
Commit graph

140 commits

Author SHA1 Message Date
Mcat12
1cad069050
Add privacy level 4 to all privacy level code 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-12-10 10:18:25 -05:00
Dan Schaper
9f672593bc
Update advanced/Scripts/webpage.sh 
Co-Authored-By: DL6ER <DL6ER@users.noreply.github.com>
 2018-11-26 20:01:41 +01:00
DL6ER
a285ae65fb
Backend changes for DHCPv4 rapid commit support 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-11-25 08:39:58 +01:00
Dan Schaper
a986f53134
Merge pull request #2436 from pi-hole/fix/password-read-error 
Fix error when reading in new password
 2018-11-01 07:05:27 -07:00
Dan Schaper
72829be281
Remove shellcheck overrides 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-10-26 12:14:10 -07:00
Adam Warner
3d4fea6510
Move -r to before the -p 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-10-26 19:17:49 +01:00
WaLLy3K
180d29c7b3
Prevent BASH from expanding Web Password 
* Resolves issue #2471

Signed-off-by: WaLLy3K <wally3k@pi-hole.net>
 2018-10-21 11:08:22 +11:00
Mcat12
7c6eecc9c8
Ignore shellcheck warning 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-09-30 18:16:08 -04:00
Mcat12
e4cbf5023a
Fix error when reading in new password 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-09-30 18:09:59 -04:00
Mark Drobnak
cedc39bf09
Merge pull request #2426 from mrmajik45/master 
Read without -r will mangle backslashes. (Fix)
 2018-09-30 17:19:56 -04:00
mrmajik45
8684356b44
read without -r will mangle backslashes. 2018-09-26 10:31:44 -04:00
Mcat12
f141b9f778
Add support for privacy level 4 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-08-20 17:36:16 -04:00
DL6ER
94e4ed6644
Add facility to add multiple audit list entries at once and to nuke audit list 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-08-10 18:22:55 +02: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
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
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
DL6ER
2ef76d5e31
Remove LOCAL_DNS_PORT support 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-05-04 22:19:39 +02:00
DL6ER
ce35509a40
Change command to "pihole -a localdnsport X" 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-18 17:30:51 +02:00
DL6ER
24b8b4e904
Add backend changes for supporting a local recursive DNS server 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-18 17:12:20 +02:00
DL6ER
6086614274
Add "-l, privacylevel" description to "pihole -a" 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-04 18:10:23 +02:00
DL6ER
4941e0f8ad
Backend changes needed to be able to set the privacy level 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-04 13:12:39 +02:00
Ryan Knapper
5ecfc58e5f
Require exact match 
Updated to require an exact match to reduce false-positives, as suggested by DL6ER.

Signed-off-by: Ryan Knapper <ryanknapper@gmail.com>
 2018-02-28 13:06:07 -05:00
Mark Drobnak
7265935cd4
Merge pull request #1915 from ryanknapper/development 
Add conditional forwarding options to webpage.sh
 2018-02-18 12:51:46 -05:00
Ryan Knapper
f2b3752f3d
lan to local 
Reduced differences.

Signed-off-by: Ryan Knapper <ryanknapper@gmail.com>
 2018-02-07 17:08:55 -05:00
Ryan Knapper
36945a67d0
Prevent redundant entries in to adlists.list 
Grep ${args[3]} and only add if grep -c -eq 0

Signed-off-by: Ryan Knapper <ryanknapper@gmail.com>
 2018-02-07 17:04:10 -05:00
DL6ER
52cc8e2fcf
Use "lan" as fallback TLD for DHCP generated domains 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-16 22:10:27 +01:00
ryanknapper
607664c860
Update webpage.sh 
Updated webpage.sh to include conditional forwarding options.
 2018-01-14 21:01:08 -05:00
DL6ER
793bdd9743
No need for cat | sed here as we source setupVars.conf, so we can use interface="${PIHOLE_INTERFACE}" 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-07 14:36:03 +01:00
DL6ER
9d50f52bb2
Add fallback interface for DNS listening behavior in case PIHOLE_INTERFACE is not set in setupVars.conf 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-07 14:34:02 +01:00
DL6ER
cfca367eef Quickly verified in dnsmasq's source code: It has to be "trust-anchor" (with "-") 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-18 21:45:24 -05:00
DL6ER
8a243c5872 Insert also old trust anchor 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-18 21:45:15 -05:00
DL6ER
b30b3f3aeb Update DNSSEC trust anchor 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-18 21:44:34 -05:00
WaLLy3K
2dc1851892
Allow passwords with spaces 
e.g: `pihole -a -p "foo bar"`

 Signed off by WaLLy3K <wally3k@pi-hole.net>
 2017-11-23 13:17:34 +11:00
WaLLy3K
bd33018660 Shellcheck OR validation 
Signed off by WaLLy3K <wally3k@pi-hole.net>
 2017-10-08 12:16:05 +11:00
Mcat12
67a5594909 Allow emails which include -h in them 
For example, mcat12@pi-hole.net would previously spit out the help message
 2017-10-07 16:06:16 -04:00
DL6ER
ee2169dd13
Merge branch 'development' into tweak/gravity 2017-09-21 17:05:30 +02:00
WaLLy3K
28063aa7f7 Add administrative contact address functionality 
* Disable shellcheck for SC1090
 2017-09-15 00:24:29 +10:00
WaLLy3K
34ae4844fa Merge branch 'development' into tweak/gravity 2017-09-14 16:44:14 +10:00
DL6ER
c9d4995900
Update to comply with current development code 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-09-08 19:35:05 +02:00
DL6ER
279e809aaf
Use poweroff instead of halt 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-09-08 19:33:06 +02:00
DL6ER
0d037e96fb
Merge branch 'development' into gedetil-development 
Signed-off-by: DL6ER <dl6er@dl6er.de>

Conflicts:
	advanced/Scripts/webpage.sh
 2017-09-08 19:32:38 +02:00
WaLLy3K
7cac207c00 Merge branch 'development' into tweak/gravity 2017-08-28 03:11:38 +10:00
Adam Warner
18b41adbf6 Merge branch 'development' into tweak/gravity 2017-07-29 17:14:39 +01:00
Adam Warner
0a9965292c
Additional check to fix any existing cases of "24h" in setupVars.conf automatically. 
Signed-off-by: Adam Warner <adamw@rner.email>
 2017-07-28 19:40:13 +01:00
Adam Warner
4fb66e632f
The other h 2017-07-28 16:30:03 +01:00
Adam Warner
5787895794
stop an extra h being added to leasetime of DHCP server. We already storethe h in setupVars.conf 
Signed-off-by: Adam Warner <adamw@rner.email>
 2017-07-28 16:10:13 +01:00
WaLLy3K
fdf2649f2f Clean up known remaining colour output issues (#1613) 
* Print newline on error message

* Output last three lines of error if update fails

* Consistent error messages & housekeeping

* Add shellcheck directive to ignore COL_TABLE
* Quoted and braced variables for codebase consistency
* Escaped newlines correctly
* Made error messages consistent (indenting and wording)
* Removed consecutive echos

* Conditional formatting consistency

* Braced, quoted and used [[ on conditionals

* Fix specific ShellCheck issues

* Fixed issues that could be safely changed without extensive testing

* Update SELinux whiptail behaviour & more

* Colourised some strings
* Fixed multiple line string indenting
* Made output consistent with existing codebase
* Removed sequential echos
* Make SELinux whiptail use "--defaultno", and change text wording

* Add help text for hostrecord, and colourise output

* this should fix the tests...

Signed-off-by: Adam Warner <adamw@rner.email>

* revert changes to `update_package_cache()` to prove tests

Signed-off-by: Adam Warner <adamw@rner.email>
 2017-07-26 18:00:08 +01:00
Mcat12
b09c660833 Always process DNS and DHCP settings in installer (#1630) 
* Always process DNS and DHCP settings in installer

* Make sure dnsmasq config exists before modifying it

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>

* Make sure the dnsmasq config directory exists

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>

* Only remove the DHCP config if it exists (fixes tests, hopefully)

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2017-07-26 17:15:23 +01:00
WaLLy3K
61ff0452e1 Remove duplicate code 
* Make RestartDNS() use `pihole restartdns`

Signed-off-by: WaLLy3K <wally3k@pi-hole.net>
 2017-07-24 21:27:12 +10:00
WaLLy3K
3631d1349e Prevent Web Admin from printing restartdns colour codes (#1575) 
* Prevent Web Admin from printing unnecessary msgs

* Make DNS restart behaviour consistent
 2017-07-15 11:11:06 +01:00