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

955 commits

Author SHA1 Message Date
Mark Drobnak
bb9a18ef08
Merge pull request #1987 from ryanknapper/patch-1 
Proper output for debug CPU detection
 2018-04-02 00:00:14 -04:00
Mark Drobnak
971e6f2664
Merge pull request #2064 from Perflyst/chronometer-1 
Add RaspberryPi 3B+ to Chronometer
 2018-03-30 17:42:50 -04:00
Dan Schaper
34d84522dd
Merge pull request #2054 from theLMGN/patch-1 
Link to the admin panel on the splash page.
 2018-03-28 20:08:39 -07:00
Perflyst
3390fbf238 Add RaspberryPi 3B+ 
Signed-off-by: Perflyst <mail@perflyst.de>
 2018-03-27 12:23:01 +02:00
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>
 2018-03-25 21:27:40 -05:00
Leo MG Nesfield (LMGN)
bfcbd72e4b
Link to the admin panel on the splash page. 2018-03-23 16:17:31 +00:00
Adam Warner
76cb129d3c
don't forget master and development branches! 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-03-07 21:48:09 +00:00
Adam Warner
246d5cd587
store checked out FTL branch in /etc/pihole/ftlbranch 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-03-07 21:41:00 +00:00
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>
 2018-02-19 10:22:28 -05:00
Mark Drobnak
f14184df30
Merge pull request #1982 from LudovicRousseau/master 
Create blacklist.txt if not existant
 2018-02-18 15:32:01 -05:00
Ludovic Rousseau
47bbea9ba7 Use " " to protect parameter substitution 
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
 2018-02-18 21:20:04 +01: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
Ludovic Rousseau
b7891f92a5 Create blacklist.txt if not existant 
Closes: https://github.com/pi-hole/pi-hole/issues/1888

Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
 2018-02-18 14:19:49 +01:00
DL6ER
5465ac9ba0
Merge pull request #1929 from pi-hole/fix/flushDB 
pihole -f: Flush database
 2018-02-17 17:45:15 +01:00
DL6ER
b8eaa9a527
Use double quotes to precent globbing and word splitting 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-02-17 13:01:00 +01:00
DL6ER
5d274008db
Use possibly user-defined database location when flushing 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-02-17 12:58:57 +01:00
Mcat12
8a42ef431b
Fix Javascript warning when no password is set 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-02-11 21:49:12 -05:00
Mcat12
2cf1f0e8fc
Hide the password input when there is no password 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-02-11 14:07:02 -05:00
Mcat12
1a5c86d32e
Revert "Hide password textbox if there is no password" 
This reverts commit 009fa2f1b7.
 2018-01-23 20:28:43 -05:00
Mcat12
c7219fbdff
Merge remote-tracking branch 'origin/development' into tweak/block-page-no-password 2018-01-21 09:09:36 -05:00
DL6ER
4c249a1186
Flush most recent 24 hours from FTL's database 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-21 13:48:13 +01:00
DL6ER
158ea1d43b
Add sqlite3 dependency 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-21 11:54:49 +01: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
Adam Warner
80307a3bcd
Remove update line from cron 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-01-12 15:43:15 +00:00
Vasilis Gerakaris
939806f021
piholeDebug.sh: Correct typo mistake 
Signed-off-by: Vasilis Gerakaris <vgerak@gmail.com>

**By submitting this pull request, I confirm the following:** 
`{please fill any appropriate checkboxes, e.g: [X]}`

- [x] I have read and understood the [contributors guide](https://github.com/pi-hole/pi-hole/blob/master/CONTRIBUTING.md), as well as this entire template.
- [x] I have made only one major change in my proposed changes.
- [] I have commented my proposed changes within the code.
- [] I have tested my proposed changes, and have included unit tests where possible.
- [] I am willing to help maintain this change if there are issues with it later.
- [x] I give this submission freely and claim no ownership.
- [x] It is compatible with the [EUPL 1.2 license](https://opensource.org/licenses/EUPL-1.1)
- [x] I have squashed any insignificant commits. ([`git rebase`](http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html))
 2018-01-12 02:17:31 +02: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
4efb533d2e
Create directories /etc/{var,log}/pihole on startup of pihole-FTL and set proper ownership 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-01 11:26:03 +01:00
DL6ER
afa2e9c2f7
Exchange hard-coded domain "localhost" by hard-coded address "127.0.0.1" 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-30 17:44:59 +01:00
DL6ER
a4c8f1a0a4
Merge pull request #1859 from pi-hole/new/extra-logging 
Enable dnsmasq's extra logging feature
 2017-12-28 22:49:43 +01:00
Adam Warner
8e0d76b63b
initiated -> initialized 
Signed-off-by: Adam Warner <adamw@rner.email>
 2017-12-24 13:26:32 +00:00
DL6ER
cca8412921
Use "echo -n" to avoid haveing newlines in the files 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-23 11:52:27 +01:00
DL6ER
d15a5ad5c1
Add required documentation in the source code 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-23 00:46:51 +01:00
DL6ER
8ed75dd176
Add extra entry to the end of the saved branches and versions such that PHP's explode() subroutine can correctly disentangle the first three entries and does not get confused by the newline character at the end of the FTL version/branch... 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-23 00:42:41 +01:00
Dan Schaper
8ca0582afc
Merge branch 'release/v3.2.1' into fix/DNSSEC_trustanchor 2017-12-21 10:56:37 -08:00
DL6ER
5c2dcb5e74
Enable dnsmasq's extra logging feature 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-21 16:42:55 +01:00
DL6ER
be0c457445
Sleep 30 seconds after reboot to be sure that the system is ready 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-21 12:42:28 +01:00
DL6ER
3c04dbb4ed
Update remote version at 17:59 as well as on reboot 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-21 12:33:08 +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
Mark Drobnak
e3fa06d7ff
Merge pull request #1829 from keithbentrup/development 
Must send HTTP headers before html
 2017-12-13 13:37:32 -05:00
Dan Schaper
423280cee1
Merge pull request #1817 from jjssoftware/development 
pihole.log permissions
 2017-12-09 14:15:12 -08:00
Keith Bentrup
45ab2a3d7a send HTTP headers before HTML 
Signed-off-by: Keith Bentrup <keith@keithbentrup.com>
 2017-12-09 17:03:20 -05:00
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>
 2017-12-09 19:00:46 +01:00
Jacob Salmela
28bed0041e
remove comment 
Signed-off-by: Jacob Salmela <github@decoy.email>
 2017-12-08 18:29:28 -06:00
Jacob Salmela
6f03e30151
fixes #1537 by checking if systemctl is found 
Signed-off-by: Jacob Salmela <github@decoy.email>
 2017-12-08 18:23:55 -06:00
Joe
6ecd93d0c9
pihole.log permissions 
This change makes pihole more friendly to the non-existence of the pihole.log file. This can help with systems that are configured to mount /var/log as a tmpfs volume. It may also help with systems where the pihole.log file is accidentally/unintentionally removed. 

Further discussion around the details of this change are in https://github.com/pi-hole/pi-hole/issues/1798
 2017-12-08 22:25:01 +00:00
Adam Warner
a9a40ca46c
Useless cat. Consider 'cmd < file | ..' or 'cmd file | ..' instead. 
Signed-off-by: Adam Warner <adamw@rner.email>
 2017-12-06 23:27:40 +00:00