arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-22 06:48:07 +00:00
Code Issues Releases Wiki Activity
4,670 Commits 9 Branches 109 Tags 20 MiB
8e7670db41
Commit Graph

4670 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Warner
8e7670db41
Merge pull request #4002 from freddii/master 
fixed typos
 2021-01-19 18:46:55 +00:00
freddii
7c0c30fb0b fixed typos 2021-01-19 19:33:38 +01:00
Adam Warner
cbfb58f7a2
Merge pull request #4000 from pi-hole/release/v5.2.4 
Pi-hole Core v5.2.4
 2021-01-19 12:29:01 +00:00
Adam Warner
0c45d23c22
Merge pull request #3997 from pi-hole/revert-3537-patch-2 
Revert "Further failsafe check for available APT packages"
 2021-01-19 08:19:46 +00:00
Dan Schaper
3f8fedfb16
Revert "Further failsafe check for available APT packages" 2021-01-17 11:10:24 -08:00
Adam Warner
cbc3fbdfe6
Merge pull request #3989 from pi-hole/release/v5.2.3 
Pi-hole Core v5.2.3
 2021-01-15 19:45:55 +00:00
Dan Schaper
020b6b8064
Merge pull request #3987 from pi-hole/fix/GitHubAPI 
Use the 'Location:' header only for latest FTL tag API check.
 2021-01-13 09:38:09 -08:00
Dan Schaper
523f650157
Use the 'Location:' header only. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2021-01-12 13:42:51 -08:00
DL6ER
c5ed8f8bed
Merge pull request #3537 from MichaIng/patch-2 
Further failsafe check for available APT packages
 2021-01-07 11:56:52 +01:00
Dan Schaper
66dfa5fc1e
Merge pull request #3958 from pi-hole/Fix/centos_stream 
Fix release check for centos stream
 2021-01-06 10:59:27 -08:00
DL6ER
1791fe22f6
Merge pull request #3912 from mdujava/basic_auth 
Fix validation of adlist url
 2020-12-31 12:19:32 +01:00
bcambl
a5422dbdf6 fix release check for centos stream 
fixes #3947 #3953

Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2020-12-30 19:45:51 -06:00
DL6ER
7507d533ac
Merge pull request #3954 from pi-hole/fix/chronometer_connection_reset 
Fix connection mechanism between Chronometer and FTL
 2020-12-30 11:13:05 +01:00
DL6ER
e033ee6664
Fix connection mechanism between Chronometer and FTL 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-12-29 10:29:02 +01:00
DL6ER
ae1a59285d
Merge pull request #3943 from yubiuser/fix/whiptail 
Change wording in whiptail for adlist selection
 2020-12-25 09:05:49 +01:00
Christian König
0d710fc9e3 Change wording in whiptail for adlist selection 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2020-12-24 21:19:14 +01:00
Adam Warner
eb86a5e3b0
Merge pull request #3937 from yubiuser/remove_malwaredomains 
Remove deprecated malwaredomains list
 2020-12-24 15:24:48 +00:00
DL6ER
667e938954
Merge pull request #3942 from pi-hole/master 
Sync dev with master
 2020-12-24 13:33:57 +01:00
Adam Warner
41bdb741b7
Merge pull request #3941 from pi-hole/release/v5.2.2 
Pi-hole Core v5.2.2
 2020-12-24 11:07:36 +00:00
DL6ER
a139af8184
Merge pull request #3940 from pi-hole/fix/i386-arch 
Add fallback for arch detection on i386/x86_64
 2020-12-24 08:38:53 +01:00
Dan Schaper
60fa93ab47
Add fallback for arch detection on i386/x86_64 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2020-12-23 14:59:28 -08:00
Christian König
b4102547ac Remove deprecated malwaredomains list 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2020-12-21 13:11:59 +01:00
Matej Dujava
ef0bdf6470 Fix validation of adlist url 
Already existing regex validation will be used on url after removing @ (in case
its in separating userinfo and host).

Signed-off-by: Matej Dujava <mdujava@kocurkovo.cz>
Fixes: https://github.com/pi-hole/pi-hole/issues/3911
Fixes: 7d19ee1b: validate blocklist URL before adding to the database (#3237)
 2020-12-21 12:50:02 +01:00
Adam Warner
87cf9add8c
Merge pull request #3934 from mwoolweaver/patch-1 
Fix typo found by #3933
 2020-12-20 15:31:02 +00:00
Michael Woolweaver
3a05ac27a2
Fix typo found by #3933 
Signed-off-by: Michael Woolweaver <m.woolweaver@icloud.com>
 2020-12-19 17:37:17 -06:00
MichaIng
eb5661b553 Further failsafe check for available APT packages 
- "apt-cache show package" succeeds as well if package is listed as (optional) dependency or conflict by another package, hence is not a 100% reliable measure.
- There is no command which explicitly checks which package/name can be selected by apt-get for install. An install simulation/dry-run is possible as it was before Pi-hole v5.1, or the whole package cache can be scraped, which is still the less time consuming solution.
- Allow to succeed if another package "provides" it, like "php7.3-apcu" provided by "php-apcu" or "awk" provided by "mawk" and "gawk", in which case the non-virtual package is selected automatically by apt-get.

For reference: 066b89fa41

Signed-off-by: MichaIng <micha@dietpi.com>
 2020-12-18 23:20:24 +01:00
DL6ER
41479524f8
Merge pull request #3900 from ganto/fix/chrono-non-lte 
Fix chronometer output if web interface is not installed
 2020-12-12 10:08:05 +01:00
Adam Warner
357b6702ec
Update advanced/Scripts/chronometer.sh 
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
 2020-12-11 12:30:52 +00:00
DL6ER
dfe64d9f51
Merge pull request #3909 from onegreydot/fix/gravity_date_updated 
Adding comma to the adlist table format
 2020-12-10 23:02:22 +01:00
DL6ER
78cdd34992
Merge pull request #3904 from ganto/fix/debug-non-web-2 
piholeDebug: Diagnose output if (Web) git directory is not found
 2020-12-10 23:00:45 +01:00
DL6ER
16fb914855
Merge pull request #3902 from ganto/fix/debug-non-web 
piholeDebug: Fix warning if lighttpd/php are not installed
 2020-12-10 23:00:02 +01:00
Reto Gantenbein
20faa1bd1c
Update pihole-FTL man-pages (#3883) 
Extend latest options and adjust ordering to Web documentation

Ensure that all configuration options currently recognized by FTL 5.3.1
are properly documented in the man page of the configuration file.

Signed-off-by: Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
 2020-12-10 22:58:07 +01:00
user
922f795fe6 Adding comma to the adlist table format 
To account for the Date Updated column in the adlist table adding a comma to the adlist to be imported into the database. This was causing intermittent failures on updates and therefore no domains would be blocked.

Signed-off-by: user <user@fedbrew.home>

 Date:      Sun Dec 6 06:03:30 2020 -0500
 Committer: user <user@fedbrew.home>

 On branch fix/gravity_date_updated
 Your branch and 'origin/fix/gravity_date_updated' have diverged,
 and have 1 and 1 different commits each, respectively.
   (use "git pull" to merge the remote branch into yours)

 Changes to be committed:
	modified:   gravity.sh

Signed-off-by: user <user@fedbrew.home>
 2020-12-06 06:08:30 -05:00
Reto Gantenbein
9dc539c98b piholeDebug: More detailed diagnostics if Web interface is not found 
Signed-off-by: Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
 2020-12-05 18:46:11 +01:00
Reto Gantenbein
18e4eb460c piholeDebug: Fix version check if lighttpd/php are not installed 
Signed-off-by: Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
 2020-12-05 14:11:53 +01:00
Reto Gantenbein
e841347057 Fix chronometer output if web interface is not installed 
Signed-off-by: Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
 2020-12-05 02:55:55 +01:00
DL6ER
6deac6dfce
Merge pull request #3894 from pi-hole/master 
Update development from Core v5.2.1 release
 2020-12-02 23:10:43 +01:00
Adam Warner
0d8ece1be2
Merge pull request #3889 from pi-hole/release/v5.2.1 
Pi-hole Core release v5.2.1
 2020-12-02 21:37:42 +00:00
Adam Warner
8443262214
Merge pull request #3890 from ganto/fix/x86-64-arch 
Ensure x86_64 processor architecture is listed as supported
 2020-12-02 21:12:18 +00:00
Dan Schaper
6993a24224
Merge pull request #3888 from pi-hole/new/github-actions-test 
Migrate from Travis to Github Actions
 2020-12-02 13:06:36 -08:00
Adam Warner
d59eab9a6e
Merge pull request #3893 from pi-hole/tweak/dontdelete 
Exit installer if directory already exists when trying to clone one of our repos into it
 2020-12-02 20:51:16 +00:00
Adam Warner
e47eb30a6e
Update automated install/basic-install.sh 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-12-02 20:49:07 +00:00
Adam Warner
641951b3a0
add some meaningful outputSigned-off-by: Adam Warner <me@adamwarner.co.uk> 2020-12-02 20:40:51 +00:00
DL6ER
db231ded91
Merge pull request #3892 from pi-hole/fix/debug_strip_comments 
Fix debugger stripping content it shouldn't
 2020-12-02 21:23:26 +01:00
Adam Warner
61f13a334d
Don't delete an existing directory and clone our repo in its place. TODO: Something more robust 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-12-02 20:19:59 +00:00
DL6ER
36937b1913
Strip such lines starting with a #. Do not silently truncate lines if they have a # somewhere in between (like server=127.0.0.1#5353) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-12-02 20:52:39 +01:00
Reto Gantenbein
d0af1a950b Ensure x86_64 processor architecture is listed as supported 
Signed-off-by: Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
 2020-12-02 20:44:11 +01:00
DL6ER
a217c75134
Merge pull request #3882 from pi-hole/tweak/conditional_transforms 
Fix processing of CONDITIONAL_FORWARDING_REVERSE
 2020-12-01 18:46:54 +01:00
Adam Warner
454c9a411c
Update advanced/Scripts/webpage.sh 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>

Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
 2020-12-01 17:27:36 +00:00
Adam Warner
f44b2f6aa3
Update advanced/Scripts/webpage.sh 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>

Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
 2020-12-01 17:27:21 +00:00