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-16 03:03:58 +00:00
Code Issues Projects Releases Packages Wiki Activity
5386 commits 8 branches 109 tags 27 MiB
Commit graph

5386 commits

This branch
This branch
All branches
Author SHA1 Message Date
DL6ER
fdaf815f42
Merge pull request #3203 from MichaIng/patch-1 
Failsafe checks for available APT package
 2020-05-05 10:27:08 +02:00
DL6ER
988b1ff02f
Merge pull request #3204 from MichaIng/patch-3 
Revert using hardcoded php-intl meta package
 2020-05-05 10:24:56 +02:00
Dan Schaper
df13b9c32a
Merge pull request #3283 from pi-hole/tweak/remove_firewall_config 
Remove configureFirewall function, the call to it, and related tests
 2020-05-02 10:06:31 -07:00
Adam Warner
4710963ccf
Merge pull request #3312 from subdavis/development 
Remove dead code
 2020-05-01 16:43:34 +01:00
Brandon Davis
1540e5bfda Remove dead code 
Signed-off-by: Brandon Davis <git@subdavis.com>
 2020-05-01 07:52:33 -04:00
Dan Schaper
017d405b28
Merge pull request #3307 from pi-hole/tweak/debugger_type_display 
Improve debugger database table printing
 2020-04-29 11:48:47 -07:00
DL6ER
ddb354f78b
Add enable indentation for the domainlist 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-29 06:23:29 +02:00
Dan Schaper
393c7730ec
Merge pull request #3299 from pi-hole/tweak/allow_()_in_urls 
Allow ( and ) in adlist URLs.
 2020-04-28 11:38:08 -07:00
DL6ER
4f0e47e927
Merge pull request #3296 from pi-hole/fix/remove_hostrecord 
Remove pihole -a hostrecord
 2020-04-28 20:06:49 +02:00
DL6ER
f4965d8493
Merge pull request #3135 from pvogt09/development 
Move permission change behind git reset
 2020-04-28 19:44:58 +02:00
DL6ER
c0cf8dba87
Merge pull request #3226 from MichaIng/patch-6 
Do not add pihole user to web server group
 2020-04-28 19:39:55 +02:00
DL6ER
a9136d752a
Merge pull request #3246 from pvogt09/fix/user_exists 
fixes #3217 by checking for existing pihole group
 2020-04-28 19:38:12 +02:00
MichaIng
d7bac21149 Dot not add pihole user to web server group 
This is and was never required and the pihole user does in fact not get any additional permissions through that group.

Signed-off-by: MichaIng <micha@dietpi.com>
 2020-04-26 15:45:29 +02:00
MichaIng
dc6c53b6a3 Revert using hardcoded php-intl meta package 
Using the meta package causes several issues:
- Install on Debian prior to Jessie and Ubuntu prior to Xenial is broken, since those do not serve the meta packages but php5-* packages instead.
- If $phpVer != "php", then multiple conflicting PHP versions can be installed.
- If "${phpVer}-intl" does not pull the correct package, then inherently "${phpVer}-xml" etc are wrong, too. This is theoretically possible, e.g. if PHP7.4 was installed while the webserver uses a concurrently installed PHP7.3 instance. Then the "php" shell command output can differ from what the webserver uses. This theoretical issue would need a different approach to derive $phpVer, not based on the shell command output but by asking the webserver somehow in the first place. But using $phpVer for some modules and hardcoded meta for the others can only lead to inconsistencies and issues.

Signed-off-by: MichaIng <micha@dietpi.com>
 2020-04-26 15:44:13 +02:00
MichaIng
86d4c9b1e0 Failsafe checks for available APT package 
When checking for available packages in APT repository, running a dry-run install can fail for other reasons, even if the package is available. Currently, in such case, wrong fallback packages are selected: https://github.com/pi-hole/pi-hole/issues/2888
"apt-cache show <pkg>" is a quicker method to check for available packages. This is now done as well to check if the fallbacks are available. If none is found, the installer exits with meaningful error message and exit code.

In rare cases, the APT list files can be missing when the installer is started. E.g. this could be on a fresh system, APT lists could have been moved to RAM or removed as a cleanup step. "apt-cache" calls will then fail, same as dry-run installs were. To assure that current package lists are checked, update the package cache directly after the Ubuntu universe repo has been added, only in the Debian/Ubuntu block. This renders the variable handling in RH/Fedora block obsolete.

Signed-off-by: MichaIng <micha@dietpi.com>
 2020-04-26 15:42:43 +02:00
DL6ER
288d487fc0
Allow ( and ) in adlist URLs. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-26 09:33:09 +02:00
pvogt09
462457fe7f
Merge branch 'development' into development 2020-04-24 12:09:49 +02:00
DL6ER
20ef5e0264
Show associated group IDs in domains/clients/adlists listing. We get the data through a LEFT JOIN followed by a GROUPing by the left list ID and finialized through a GROUP_CONCATenation. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-24 10:33:46 +02:00
DL6ER
ad5802715e
enabled field: Center 0, right-align 1 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-23 15:16:48 +02:00
DL6ER
989bbad37e
Remove pihole -a hostrecord 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-23 13:20:15 +02:00
DL6ER
63f6c6a894
Add indentation for enabled and type fields 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-23 10:01:22 +02:00
Adam Warner
d42785a3bf
Merge pull request #3271 from pi-hole/tweak/version 
Add branch name to pihole -v
 2020-04-21 16:07:27 +01:00
DL6ER
401c029dc4
Improve else condition of branch determination 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-21 16:08:32 +02:00
DL6ER
ed9d74593d
Merge pull request #3289 from pi-hole/tweak/boldify_uniques 
Gravity: Boldify number of unique domains
 2020-04-21 10:18:23 +02:00
Adam Warner
9286965ee2
Merge pull request #3287 from pi-hole/tweak/remove-deprecated-list 
Remove Deprecated cameleon list
 2020-04-21 08:32:24 +01:00
DL6ER
fa57c457f3
Boldify number of unique domains as this is the actually interesting number 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-21 09:10:21 +02:00
DL6ER
0343171703
Add correct displaying for detached HEAD state. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-21 08:54:28 +02:00
DL6ER
176fbaf83b
Ask pihole-FTL for the branch it was compiled from instead of trusting the checkout file to be present. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-21 08:51:17 +02:00
Adam Warner
94a4f844a8
Remove deprecated list 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-04-20 21:31:20 +01:00
Adam Warner
d18a8b1b8a
Merge pull request #3205 from MichaIng/patch-5 
Reduce apt-get install verbosity
 2020-04-19 15:28:48 +01:00
Adam Warner
a37dba2c81
remove configureFirewall function, the call to it, and related tests 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-04-19 14:52:01 +01:00
Adam Warner
471006676c
Merge pull request #3227 from pi-hole/new/CLI_domain_comments 
Add option --comment "whatever" for adding comments for new domains through the CLI interface.
 2020-04-19 14:39:05 +01:00
Adam Warner
0155d42650
Merge pull request #3252 from yubiuser/patch-1 
add [options] for 'pihole restart' to manpage and cli help output
 2020-04-19 14:35:24 +01:00
Adam Warner
e80990c27a
Merge pull request #3282 from pi-hole/revert-3276-feature/support_for_new_cloudflare_dns_for_families 
Revert "- Support for Cloudflare's new DNS for Families"
 2020-04-19 14:32:32 +01:00
Adam Warner
e6dcccc7bd Revert "- Added 2 new DNS entries for the new Cloudflare DNS for families, which comes in 2 flavors (#3276)" 
This reverts commit 7e1a8c1ceb.
 2020-04-18 20:05:54 +01:00
Adam Warner
3cc9ba4ee8
stickler Signed-off-by: Adam Warner <me@adamwarner.co.uk> 2020-04-18 12:57:06 +01:00
Adam Warner
6dc85c3527
Don't display branch name if it is on master. 
Prefer cached remote version over github API

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-04-18 12:51:04 +01:00
Mohammed Swillam
7e1a8c1ceb
- Added 2 new DNS entries for the new Cloudflare DNS for families, which comes in 2 flavors (#3276) 
1- 1.1.1.2 (No Malware)
2- 1.1.1.3 (No Malware or Adult Content)

This would allow parents to have more control over the safety of their family's network.

Signed-off-by: Mohammed-Swillam <moh.sayed@hotmail.com>
 2020-04-18 11:49:01 +01:00
Dan Schaper
4f01daf5bc
Merge pull request #3244 from atenart/remove-hosts-file-ads-list 
basic_install: remove remaining references to hosts-file.net
 2020-04-16 13:33:34 -07:00
Dan Schaper
0f20470a38
Merge pull request #3269 from pi-hole/tweak/hosts-comments 
Add support for comments in HOSTS-like files
 2020-04-15 11:11:10 -07:00
Adam Warner
851947bbf2
Add branch name to version output 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-04-13 20:58:46 +01:00
Dan Schaper
413fa94e98
Merge pull request #3263 from mschoettle/fix/broken-blocking-landing-page-v5.0 
Fixes broken blocking page and landing page when changing server port or host name (v5.0)
 2020-04-10 20:50:26 -07:00
Matthias Schoettle
308eb5eda5 Fixes broken blocking page and landing page when changing server port and/or hostname. 
See issues #2195 and #2720.

Signed-off-by: Matthias Schoettle <git@mattsch.com>
 2020-04-10 12:29:01 -04:00
DL6ER
093054a1eb
Automatically convert legacy IP range to Class C network 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-09 09:49:07 +02:00
DL6ER
4130af0aab
Retain rev-server settings when the feature gets disabled. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-09 09:05:50 +02:00
DL6ER
90a5a13197
Convert CONDITIONAL_FORWARDING to REV_SERVER settings. Try to detect intended CIDR range automatically. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-08 15:35:35 +02:00
DL6ER
1632632668
Merge pull request #3259 from pi-hole/update_devel 
Update development from release/v5.0
 2020-04-08 12:28:29 +02:00
DL6ER
982c1b0059
Merge branch 'release/v5.0' into development 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-08 12:02:53 +02:00
Adam Warner
26f71e4dbe
accidentally a space 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-04-05 12:34:14 +01:00
Adam Warner
b6ac1585ec
add regex attribution 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-04-05 12:29:45 +01:00