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 |
|
DL6ER
|
635b4e952f
|
Add NOERROR/NXDOMAIN support in the DNS resolution test
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2023-10-28 08:20:31 +02:00 |
|
DL6ER
|
c86e7b3f96
|
Generalize CPU check to a short hardware information output
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2023-10-28 08:13:31 +02:00 |
|
DL6ER
|
dcc7e96d2f
|
Remove detection of addresses of PIHOLE_INTERFACE as it is gone, too
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2023-10-28 08:07:11 +02:00 |
|
DL6ER
|
ccd8c470a5
|
check_x_headers is no more
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2023-10-28 08:03:37 +02:00 |
|
DL6ER
|
00d7e998b4
|
setupVars.conf and pihole-FTL.conf are no more - use pihole.toml instead
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2023-10-28 08:03:09 +02:00 |
|
Christian König
|
d77dbf736c
|
Logrotate config file needs to be owned by root
Signed-off-by: Christian König <ckoenig@posteo.de>
|
2023-10-18 22:09:38 +02:00 |
|
yubiuser
|
aaa9acc0b9
|
Update query.sh to use FTL's API instead of directly interacting with the database (#5361)
|
2023-10-16 21:00:42 +02:00 |
|
Christian König
|
2005d04625
|
Exact search is the new default
Signed-off-by: Christian König <ckoenig@posteo.de>
|
2023-10-14 21:50:57 +02:00 |
|
yubiuser
|
539f379cb4
|
Remove Chronometer (#5423)
|
2023-10-14 19:40:02 +02:00 |
|
Christian König
|
f7ba059b94
|
Query directly and authenticate only if required
Signed-off-by: Christian König <ckoenig@posteo.de>
|
2023-10-14 14:03:56 +02:00 |
|
Christian König
|
e374950915
|
Merge branch 'development-v6' into query_list_v6
|
2023-10-13 21:49:09 +02:00 |
|
Christian König
|
40c75289b5
|
Allow pihole to access subdirs in /etc/pihole
Signed-off-by: Christian König <ckoenig@posteo.de>
|
2023-10-13 20:07:25 +02:00 |
|
Christian König
|
46ff257344
|
Remove Chronometer
Signed-off-by: Christian König <ckoenig@posteo.de>
|
2023-10-12 13:44:51 +02:00 |
|
Adam Warner
|
71357ecae7
|
adminlte->web
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
|
2023-10-08 14:12:02 +01:00 |
|
Adam Warner
|
7886dc0172
|
adminlte->web
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
|
2023-10-08 14:09:47 +01:00 |
|
Christian König
|
afa688e3a0
|
Yu vs uh
(https://www.theguardian.com/guardian-observer-style-guide-r#:~:text=re/re%2D,re%2Dsign/resign)
Signed-off-by: Christian König <ckoenig@posteo.de>
|
2023-10-07 00:21:06 +02:00 |
|
Christian König
|
edf0060acf
|
Fix spellcheck errors
Signed-off-by: Christian König <ckoenig@posteo.de>
|
2023-10-06 22:26:08 +02:00 |
|
Adam Warner
|
885b626a68
|
Some unrelated spelling mistakes that spellcheck is grumbling about
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
|
2023-10-04 16:22:01 +01:00 |
|
Adam Warner
|
69a264a3c2
|
Add antigravity support to gravity (#5330)
|
2023-09-29 19:09:24 +01:00 |
|
DL6ER
|
43ddfcf2ca
|
Ensure pihole-FTL can write to all files in /etc/pihole, /run/pihole and /var/log/pihole (#5356)
|
2023-09-26 19:59:56 +02:00 |
|
DL6ER
|
ea23c8364d
|
Move antigravity-related changed to gravits database migration step 16->17
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2023-09-16 10:04:29 +02:00 |
|
DL6ER
|
df92b8ac14
|
Add missing creation of view vw_antigravity as well as schema change to vw_adlist
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2023-09-12 20:43:34 +02:00 |
|
DL6ER
|
f19a56cf87
|
Merge branch 'development-v6' into new/antigravity
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2023-09-11 11:43:56 +02:00 |
|
Christian König
|
52268f0155
|
Ignore ABP style entries in debug log dig test
Signed-off-by: Christian König <ckoenig@posteo.de>
|
2023-09-07 22:32:09 +02:00 |
|
Christian König
|
843f57399c
|
Ignore ABP style entries in debug log dig test
Signed-off-by: Christian König <ckoenig@posteo.de>
|
2023-09-07 22:27:49 +02:00 |
|
Christian König
|
c33963b250
|
Check for valid OS via IPv4 and IPv6
Signed-off-by: Christian König <ckoenig@posteo.de>
|
2023-08-27 15:11:47 +02:00 |
|
Christian König
|
ee4eb8db20
|
chmod +x
Signed-off-by: Christian König <ckoenig@posteo.de>
|
2023-08-13 22:26:44 +02:00 |
|
Christian König
|
8e0a40e717
|
Use api.sh within query.sh
Signed-off-by: Christian König <ckoenig@posteo.de>
|
2023-08-13 22:24:05 +02:00 |
|
Christian König
|
2227a2c569
|
Add API functions
Signed-off-by: Christian König <ckoenig@posteo.de>
|
2023-08-09 21:25:50 +02:00 |
|
Christian König
|
3c693c1da5
|
Apply suggestions from code review
Co-authored-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: Christian König <ckoenig@posteo.de>
|
2023-08-06 12:04:55 +02:00 |
|
Christian König
|
7bb0ca59d1
|
Remove traces of /run/pihole
Signed-off-by: Christian König <ckoenig@posteo.de>
|
2023-08-05 14:54:09 +02:00 |
|
Christian König
|
587a2a1c04
|
# allow all users to enter der directories
Signed-off-by: Christian König <ckoenig@posteo.de>
|
2023-08-04 23:52:53 +02:00 |
|
Christian König
|
c360743d41
|
Re-add file/folder permissions
Signed-off-by: Christian König <ckoenig@posteo.de>
|
2023-08-04 21:12:40 +02:00 |
|
Christian König
|
8ef8a27583
|
Remove webpage.sh
Signed-off-by: Christian König <ckoenig@posteo.de>
|
2023-08-04 20:04:45 +02:00 |
|
Christian König
|
a3ea2cd8c3
|
User pihole should be allowed to edit all its files
Signed-off-by: Christian König <ckoenig@posteo.de>
|
2023-08-04 19:32:19 +02:00 |
|
Christian König
|
5ae0405446
|
Ensure pihole-FTL can write custom.list
Signed-off-by: Christian König <ckoenig@posteo.de>
|
2023-08-03 20:46:01 +02:00 |
|
DL6ER
|
375d4d9bc1
|
Add type as new field of view vw_adlist
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2023-07-18 08:13:36 +01:00 |
|
DL6ER
|
00cbb8bc8a
|
Add antigravity support to gravity
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2023-07-18 08:13:36 +01:00 |
|
DL6ER
|
64319fa96e
|
Add /var/log/pihole/webserver.log to the logrotate scripts. While it may be empty for most, it can grow quickly if either API or TLS debugging is enabled (it can quickly reach several hundreds of MB per day when debugging TLS)
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2023-07-05 22:11:56 +01:00 |
|
Adam Warner
|
c557f29db2
|
Set new gravity database version to 16, which was missed in 5459daa
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
|
2023-07-03 23:01:27 +01:00 |
|
DL6ER
|
5459daa03d
|
Add abp_entries column (default 0) to the adlist table for newly created gravity databases. This updates the gravity database version to 16
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2023-06-15 09:36:17 +02:00 |
|
Christian König
|
088b2c2920
|
Do not remove -all|excat when not sourrounded by space in query.sh
Signed-off-by: Christian König <ckoenig@posteo.de>
|
2023-06-04 22:57:31 +02:00 |
|
Christian König
|
ba3e290915
|
Fix shellcheck errors
Signed-off-by: Christian König <ckoenig@posteo.de>
|
2023-06-04 21:21:48 +02:00 |
|
Christian König
|
7351a4d3b1
|
Merge branch 'development' into development-v6
Signed-off-by: Christian König <ckoenig@posteo.de>
|
2023-06-01 15:45:05 +02:00 |
|
Adam Warner
|
11679a5188
|
@MrDuck2742 dropped a ] on the floor without me seeing. I picked it up and put it back again
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
|
2023-05-28 23:31:51 +01:00 |
|
DL6ER
|
137e6dc184
|
Remove all the undocumented now useless stuff from pihole -a
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2023-05-28 09:01:02 +02:00 |
|
yubiuser
|
f59610081e
|
remove outdated comments (#5227)
|
2023-05-27 22:41:11 +02:00 |
|
Christian König
|
b5800ef718
|
Remove getFTLAPIPort() function and fix pihole status
Signed-off-by: Christian König <ckoenig@posteo.de>
|
2023-05-27 11:53:00 +01:00 |
|
Christian König
|
44bfb8ebf0
|
Remove the ability to reboot/shutdown via webpage.sh
Signed-off-by: Christian König <ckoenig@posteo.de>
|
2023-05-27 11:53:00 +01:00 |
|
Adam Warner
|
c0e352094d
|
REVISIT: Remove some references to setupVars (some files can probably go entirely...)
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
|
2023-05-27 11:51:16 +01:00 |
|
Adam Warner
|
7cbe713873
|
REVISIT: Don't rely on existence of setupVars.conf
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
|
2023-05-27 11:51:16 +01:00 |
|