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
ee4eb8db20
chmod +x
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2023-08-13 22:26:44 +02:00
8e0a40e717
Use api.sh within query.sh
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2023-08-13 22:24:05 +02:00
2227a2c569
Add API functions
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2023-08-09 21:25:50 +02:00
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
7bb0ca59d1
Remove traces of /run/pihole
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2023-08-05 14:54:09 +02:00
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
c360743d41
Re-add file/folder permissions
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2023-08-04 21:12:40 +02:00
8ef8a27583
Remove webpage.sh
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2023-08-04 20:04:45 +02:00
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
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
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
00cbb8bc8a
Add antigravity support to gravity
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2023-07-18 08:13:36 +01:00
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
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
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
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
ba3e290915
Fix shellcheck errors
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2023-06-04 21:21:48 +02:00
7351a4d3b1
Merge branch 'development' into development-v6
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2023-06-01 15:45:05 +02:00
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
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
f59610081e
remove outdated comments ( #5227 )
2023-05-27 22:41:11 +02:00
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
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
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
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
0e8f285f4f
Always assume that the web interface will be installed.
...
We could revist this again in future if we decide that there should still be a choice to install the interface or not
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2023-05-27 11:51:16 +01:00
2784b267ec
pihole command: read values from pihole-FTL instead of setupvars.conf
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2023-05-27 11:51:16 +01:00
3cb3adc5ca
Fix setting webpassword via pihole -a -p
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2023-05-27 11:51:16 +01:00
019be067d9
Convert SetWebPassword to use new FTL config
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2023-05-27 11:51:16 +01:00
632aead691
add wrappers to utils.sh for setting FTL config & add tests
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2023-05-27 11:51:16 +01:00
31f16510e2
Clear out some no longer needed ftl/dnsmasq config code
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2023-05-27 11:51:15 +01:00
c520b29326
some more lighttpd refs (tests can come later)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2023-05-27 11:51:15 +01:00
9f31ab8a6f
Debug log does not need to check php/lighttpd
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2023-05-27 11:51:15 +01:00
23f2db01bb
Use list parsing functionality of FTL ( #5275 )
2023-05-27 12:48:26 +02:00
82b60b09d4
Fix issue with Adding Local DNS Records does not add to /etc/pihole/custom.list when using grep 3.10 ( #5269 )
2023-05-27 11:28:19 +01:00
c92826c152
Do not copy info table during pihole -g
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2023-05-24 21:32:34 +02:00
19d50b9669
Don't source the install script in webpage.sh ( #5270 )
2023-05-10 19:55:51 +02:00
b8c3f6d999
Adding Local DNS Records does not add to /etc/pihole/custom.list
...
Fixes #5268
Signed-off-by: MrDuck2742 <jim@datachord.co.uk >
2023-05-08 04:41:53 +01:00
e6ae2e98cc
Don't source the install script in webpage.sh
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2023-05-07 13:21:23 +02:00
fd4e8766e4
Remove unused code from query.sh
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2023-05-02 22:50:51 +02:00
fa116389c2
remove old comments
...
Signed-off-by: ipitio <21136719+ipitio@users.noreply.github.com >
2023-03-23 01:23:35 +00:00
58275ecd13
Revert "Ignore commented lines when reading PRIVACYLEVEL from config file"
2023-03-22 21:52:39 +00:00
fb032ea6e7
Ignore commented lines when reading PRIVACYLEVEL from config file ( #5177 )
2023-03-22 12:23:40 -07:00
66ed7c9ea3
Declaring all local variables under the function declaration line
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br >
2023-03-21 16:34:50 -03:00
ac2f13adef
Allow pihole -q to match subdomains using ABP style domains ( #5210 )
2023-03-21 15:39:11 +00:00
6b919f3a2e
Removing unnecessary commas
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br >
2023-03-21 12:27:20 -03:00
3c91b6558d
restore the addKey comment, reworded for anchors
...
Per @dschaper, restore the addKey clarifying comment. It has
been reworded to describe the use of anchors where before it
referenced using grep's 'match only an entire line' argument.
Signed-off-by: William Blew <william@kulian.org >
2023-03-17 11:50:53 -07:00
b9a6970bfd
Fix addKey to handle substrings of existing keys
...
Fix addKey to handle the case where a key is being added, and that key
is the leading substring of an already existing key within that file.
For example: add "server=192.168.1.1", when "server=192.168.1.178"
already exists within the /etc/dnsmasq.d/01-pihole.conf file.
Check pihole docker with PIHOLE_DNS="192.168.1.178;192.168.1.1". Its
/etc/dnsmasq/01-pihole.conf will be missing its second server= entry.
Add the test_key_addition_substr, to test addKey when
its adding a substring key of an existing key in the file.
Signed-off-by: William Blew <william@kulian.org >
2023-03-17 11:50:52 -07:00
20f8c6af3c
Search for ABP entries only if they exist in gravity.db
...
and use `abp_domains` property.
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br >
2023-03-17 14:17:53 -03:00
