Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-24 13:50:17 +00:00
Code Issues Projects Releases Packages Wiki Activity
3314 commits 11 branches 109 tags 28 MiB
Commit graph

1014 commits

Author SHA1 Message Date
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
Rob Gill
d61fd01d61
Split queryFunc() into query.sh 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-13 15:47:08 +10:00
Alex Villarreal
e422f4154f Clean error message on successful response 
Signed-off-by: Alejandro Villarreal <alex@alexvy86.com>
 2018-06-11 12:59:53 -05:00
Rob Gill
cabb06230c
--json not --jason 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-09 10:30:04 +10:00
Rob Gill
8004080643
Additional command-line completion 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-06 22:37:43 +10:00
Mark Drobnak
d232f08933
Merge pull request #2208 from pi-hole/tweak/checkout 
Don't run the installer when doing ftl checkout, instead just run the…
 2018-06-03 14:35:35 -04: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
Rob Gill
83ff0055b6
Test and indicate status 
This added function tests if pihole-FTL is running when the sysV.

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-02 15:30:51 +10: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
Mark Drobnak
9fd70cbdf9
Merge pull request #2057 from pi-hole/fix/debug-empty-ports 
debug script: fix empty ports on some systems
 2018-05-30 21:48:53 -04:00
Mark Drobnak
3f3254a4df
Merge pull request #2176 from rrobgill/php5fix 
Fix block page crash on PHP 5.4
 2018-05-22 23:21:20 -04:00
Mark Drobnak
f568012b9d
Merge pull request #2070 from pi-hole/new/debug-locale 
Get user locale when debugging
 2018-05-14 16:43:05 -04:00
Rob Gill
382c19024f
oh stickler bot... 
accidentally a space

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-05-12 10:53:44 +10:00
Rob Gill
9379487942
changes as requested 
changes as requested 

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-05-12 10:49:01 +10:00
Rob Gill
5e99baf7b9
Update index.php 
thanks stickler-ci  .......

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-05-11 14:52:30 +10:00
Rob Gill
31951dae4c
Update index.php 
Avoiding calling empty() on a function allows this to work under PHP5. Making the check for blocklist generation in this way instead is compatible with both PHP5 and PHP7.

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-05-11 14:31:42 +10:00
DL6ER
2ef76d5e31
Remove LOCAL_DNS_PORT support 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-05-04 22:19:39 +02:00
Adam Warner
a6e4b0fea5
- Test for existence of remote non-master branch of FTL before attemtping to check for update 
- Move some functions from checkout to basic-install
- provide helpful error message on downlaod not existing

Signed-off-by: Adam Warner <adamw@rner.email>
 2018-05-01 23:15:26 +01:00
MichaIng
43f19034b9
"INSTALL_WEB" renamed to "INSTALL_WEB_INTERFACE" #2115 
+ Small fix, as due to PR https://github.com/pi-hole/pi-hole/pull/2115 variable "INSTALL_WEB" was renamed into "INSTALL_WEB_INTERFACE".
 2018-04-28 15:17:29 +02:00
Adam Warner
ceaf4bc6bc
Some extra code made it's way into the dev branch. Not entirely sure how that happened... related to #2115 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-23 20:46:57 +01:00
Dan
acfc49fd41
Merge branch 'development' into Install-Web-Server 2018-04-22 09:23:11 +01: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
Adam Warner
6ba53c1ac0
Merge branch 'development' into FTLDNS 2018-04-15 20:46:13 +01:00
Mark Drobnak
d4870b3854
Merge pull request #2053 from pi-hole/tweak/debug-logs 
Get head and tail of pihole-FTL.log during debug process
 2018-04-15 14:23:25 -04:00
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>
 2018-04-15 18:25:35 +01:00
Daniel (Fourdee)
3a483a1b20 install_web_server 
+ Splits web interface and server into two variables.
+ Option to disable forced install of Lighttpd.
 2018-04-15 02:08:16 +01:00
Adam Warner
310d33b8ee
Merge dev > FTLDNS fix merge conflicts 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-13 17:01:54 +01:00
Adam Warner
8b5dcc3872
Match change made by 7edab27 to prevent merge conflict 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-13 16:53:57 +01:00
Ludovic Rousseau
7edab27e53 Stylistic change to use an explicit if/then/fi 
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
 2018-04-13 12:19:55 +02:00
Ludovic Rousseau
9b3531f634 Fix stylistic issue 
Expand variable using ${FTLconf}

Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
 2018-04-13 11:48:34 +02:00
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>
 2018-04-13 11:16:58 +02:00
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>
 2018-04-13 11:16:50 +02:00
Jacob Salmela
5ffc3561ed
implement dschapers suggestions--better command, less subshells, and finer formatting 
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
 2018-04-11 20:35:51 -05:00
Dan Schaper
250b445eee
Split declaration and population for stickler. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-04-10 21:37:04 -07:00
DL6ER
82d5afe996
Silence error in log flush subroutine when no pihole-FTL.conf can be found 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-05 22:28:55 +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
Adam Warner
6bb4780d32
Merge pull request #2077 from pi-hole/tweak/FTLDNSExperiments 
FTLDNS tweaks
 2018-04-04 17:00:03 +01:00
Adam Warner
631f5b4848 Change order of updatable components to match the end output 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-04 16:35:11 +01: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
Adam Warner
f37b2bc7c1
move call to get_binary_name into FTLcheckUpdate() to avoid having to run that first 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-02 23:22:06 +01:00
Adam Warner
56278c6394
Fix shellcheck complaints 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-02 22:06:36 +01:00
Adam Warner
b1d6c03190
Break out binary name funtion to it's own function 
Remove duplicate code. get_binary_name is now in the install script
Add some "version" checking to ftl download when using an alt branch, uses checksum
Greatly simplify update process. Source pihole-FTL version checker from basic-install.sh
Always run install script to finalise changes.
Install script now outputs versions after an update
(This is a Squash of previous work into one commit)

Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-02 21:53:32 +01:00
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
Jacob Salmela
1a275ba184
debug user locale; improve function to parse variables and files 
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
 2018-04-01 06:40:48 -05: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