Commit Graph

1477 Commits

Author SHA1 Message Date
Dominik 719ce801f5
Add "-ni" to all sqlite3 invocations () 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 fe4d934a40 Simplify pihole -v
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-12-09 23:13:04 +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
yubiuser 2529fbeacd
Treat FTL return data as strings () 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
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` () 2023-11-04 17:43:09 +01:00
yubiuser 758ace57c0
Check for valid OS via IPv4 and IPv6 () 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
yubiuser aaa9acc0b9
Update query.sh to use FTL's API instead of directly interacting with the database () 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
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 46ff257344
Remove Chronometer
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-10-12 13:44:51 +02:00
Adam Warner 7886dc0172
adminlte->web
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-10-08 14:09:47 +01: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 () 2023-09-29 19:09:24 +01: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 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 8ef8a27583
Remove webpage.sh
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-08-04 20:04:45 +02:00
DL6ER 00cbb8bc8a
Add antigravity support to gravity
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-07-18 08:13:36 +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