1
0
mirror of https://github.com/pi-hole/pi-hole synced 2024-11-19 14:48:13 +00:00
Commit Graph

1993 Commits

Author SHA1 Message Date
DL6ER
c02401b81e
Highlight "### CHANGED" strings in the debug log of pihole.toml
Signed-off-by: DL6ER <dl6er@dl6er.de>
2024-03-09 16:57:28 +01:00
DL6ER
9ff43040ec
Add list type in pihole -q
Signed-off-by: DL6ER <dl6er@dl6er.de>
2024-02-13 09:58:29 +01:00
DL6ER
75fadb9b55
Adlists need to be grouped by both address and type to differentiate between anti-/gravity lists
Signed-off-by: DL6ER <dl6er@dl6er.de>
2024-02-13 08:55:26 +01:00
DL6ER
1a59b407e0
Merge branch 'development-v6' into tweak/allow_adlist_dups 2024-02-13 07:47:30 +01:00
DL6ER
b5ab8ac198
Change UNIQUEness constraint from (address) to (address, type) in the adlist table. This will allow certain adlists to be associated to different groups. A possible scenario is an adlist meant to block a specific service (e.g. Twitter, Youtube, etc.). It can then either be used to ensure these services are really blocked on the devices of group A but will never be blocked on devices of group B.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2024-02-11 16:54:22 +01:00
DL6ER
8b3469cabc
Merge branch 'development-v6' into development-v6-merge-development
Signed-off-by: DL6ER <dl6er@dl6er.de>
2024-02-11 16:41:41 +01:00
yubiuser
aca7b31b83
Remove local.list and openVPN traces (#5480) 2024-02-10 06:16:00 +01:00
Dominik
8f36fdf11c
Make IDs of anti-/gravity lists available in vw_(anti)gravity (#5526) 2024-02-09 20:52:29 +01:00
Adam Warner
f193edd428
Merge branch 'development' into development-v6-merge-development (resolved conflicts)
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2024-02-09 19:22:53 +00:00
DL6ER
31a8f150b2
Add checking for availability of ftl.pi-hole.net when using FTL from a custom branch. If the server is down (or the user is offline, cannot resolve the domain, etc.), we fail early and hard instead of possibly corrupting the installation
Signed-off-by: DL6ER <dl6er@dl6er.de>
2024-01-31 08:00:28 +01:00
yubiuser
cc8f9fe057
Use 204 return code for deleted sessions (#5541) 2024-01-27 22:05:09 +01:00
DL6ER
47f06dfd71
Do not store remote version in versions file if on custom branch. It's always wrong here
Signed-off-by: DL6ER <dl6er@dl6er.de>
2024-01-15 20:53:34 +01:00
Christian König
debab10792
Use 204
Signed-off-by: Christian König <ckoenig@posteo.de>
2024-01-11 20:42:32 +01:00
DL6ER
d2828310f2
Modify DELETE triggers to delete BEFORE instead of AFTER to prevent possible foreign key constraint violations
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-12-28 11:12:20 +01:00
DL6ER
00340136bd
Extend %iface logic to the dig test. Also fix intentation in this function
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-12-26 21:35:24 +01:00
DL6ER
0c6363572b
Append the interface to the gateway address if it is a link-local address
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-12-25 22:00:49 +01:00
DL6ER
1b87ec067e
Exit early if the database does not exist (e.g. in some CI tests)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-12-25 06:12:18 +01:00
DL6ER
0066c6fbff
Make IDs of anti-/gravity lists available in vw_(anti)gravity
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-12-25 05:29:29 +01:00
Dominik
719ce801f5
Add "-ni" to all sqlite3 invocations (#5518) 2023-12-10 10:17:48 +01:00
Christian König
c3c31a1a60 Print version details automatically if not on master
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-12-09 23:14:58 +01:00
Christian König
b333e30162 Remove version options from bash completion
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-12-09 23:14:58 +01:00
Christian König
fe4d934a40 Simplify pihole -v
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-12-09 23:13:04 +01:00
yubiuser
a6c0d279b6
Remove obsolete sudo file (#5514) 2023-12-09 23:11:04 +01:00
DL6ER
3f7413d538
Add "-ni" to all sqlite3 invocations
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-12-09 23:07:35 +01:00
DL6ER
c90a27c509
Add "-ni" to all sqlite3 invocations
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-12-09 23:06:50 +01:00
Christian König
6d02d4056f
Rename option --admin to --web in version function
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-12-09 22:01:30 +01:00
Christian König
fe7299323c
Update bash_completion
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-12-09 21:40:32 +01:00
Christian König
a87d1bbc4f Remove pihole.sudo
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-12-09 21:04:56 +01:00
yubiuser
2529fbeacd
Treat FTL return data as strings (#5509) 2023-12-09 18:35:14 +01:00
Christian König
2681835f94
Treat FTL return data as strings
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-12-06 00:23:15 +01:00
DL6ER
32a741b5c7
We do not follow 308 but FTL also doesn't suggest it
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-12-02 22:42:36 +01:00
DL6ER
96bf07863f
Use CHAOS TXT local.api.txt instead of trying to parse pihole-FTL --config webserver.ports
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-12-01 09:10:06 +01:00
DL6ER
6016131280
Ensure we also check the last port
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-11-28 22:59:49 +01:00
DL6ER
974fea592d
Iterate over ports, skip redirected ports
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-11-28 00:05:55 +01:00
DL6ER
a6565bf9a1
Support special webserver.port ports ending in "s" (secure) and "r" (redirect)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-11-23 22:07:31 +01:00
Christian König
b61e8be3b4
Address reviewer's comment
Co-authored-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-11-13 23:04:44 +01:00
Christian König
54ab71d817
Don't use hardcoded ports to check for
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-11-13 23:04:44 +01:00
Christian König
e7c89ce25f
No need to pass a default value to get_ftl_conf_value()
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-11-13 23:04:44 +01:00
Christian König
d3813c4be5
Update check for required ports
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-11-13 23:04:44 +01:00
Christian König
86aa6b1df6
Improve v6 debug log and remove leftovers
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-11-13 23:04:44 +01:00
Christian König
f65b126433
Move custom.list to /hosts/custom.list
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-11-13 21:37:41 +01:00
Christian König
de6e61705e
Remove local.list and openVPN traces
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-11-06 21:40:32 +01:00
DL6ER
72c972175d
Remove left-over parts of setupVars processing and only include pihole.toml once
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-11-06 13:53:08 +01:00
DL6ER
395110f92f
When setting a blank password, use webserver.api.password instead of webserver.api.pwhash (#5465) 2023-11-04 17:43:09 +01:00
yubiuser
758ace57c0
Check for valid OS via IPv4 and IPv6 (#5305) 2023-11-04 08:02:38 +01:00
Christian König
ced1c5d50b Start counting at postion 1
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-11-01 21:57:36 +01:00
Christian König
480a8c8d7f
Remove idn2 as punycode conversion is handled by FTL
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-10-31 21:02:26 +01:00
Adam Warner
ab3b6dfa67
No need to >/dev/null because setFTLConfigValue already does this
adjust output of setFTLConfigValue to test for the exit code of `pihole-FTL --config`
2023-10-28 19:46:45 +01:00
DL6ER
d377cfbc3e
Extract the first entry in the answer section from dig's output, replacing any multiple spaces and tabs with a single space
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-10-28 08:34:30 +02:00
DL6ER
15be8eeffa
Remove lighttpd config test
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-10-28 08:21:08 +02:00