6ffa2ba1b2
Merge pull request #4547 from pi-hole/development
...
Pi-hole Core v5.9
2022-02-12 20:04:20 +00:00
e9250d62c5
Merge pull request #4598 from pi-hole/alt-4597
...
Use case insensitive deletion when removing custom CNAME/DNS records
2022-02-04 21:26:33 +00:00
08999bf315
Use case insensitive deletion when removing custom CNAME/DNS records in case of manual entries with mixed case having been added
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2022-02-04 21:16:02 +00:00
2bd670a3dd
Merge pull request #4582 from lschloetterer/patch-1
...
add parameter to set filename for teleporter
2022-02-04 20:44:49 +00:00
f342b2c9f6
Merge pull request #4489 from pi-hole/tweak/manpages
...
Remove pihole-FTL.conf manpage
2022-02-04 20:36:32 +00:00
2a0bb5b9ee
Create second entry for teleporter and adjust spacing
...
Signed-off-by: Lukas Schlötterer <80917404+lschloetterer@users.noreply.github.com >
2022-02-04 21:29:23 +01:00
c3c5342b48
Fix reviewer's comment
...
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com >
2022-02-04 21:11:54 +01:00
d7d8e9730b
Remove pihole-FTL.conf.5 from automated tests
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2022-02-04 20:43:47 +01:00
7c60ee8df1
Remove pihole-FTL.conf man page
...
Signed-off-by: Christian König <ckoenig@posteo.de >
Remove double https://
Signed-off-by: Christian König <ckoenig@posteo.de >
2022-02-04 20:43:47 +01:00
ee9f4856a2
Merge pull request #4596 from pi-hole/long-live-centos8-stream
...
Switch from centos8 to centos8:stream base image for centos 8 tests
2022-02-03 19:05:16 +00:00
444526ad58
Switch from centos8 to centos8:stream base image for centos 8 tests
2022-02-03 18:43:19 +00:00
844c4dcdc8
Merge pull request #4584 from pi-hole/fix/gravity_internal_sqlite3
...
Replace calls to sqlite3 by calls to pihole-FTL sqlite3
2022-02-03 05:45:04 +01:00
881d92632c
add hint for custom teleporter filename to help function
...
Signed-off-by: Lukas Schlötterer <80917404+lschloetterer@users.noreply.github.com >
2022-02-01 09:41:57 +01:00
76d4e1209f
Merge pull request #4585 from pi-hole/tweak/sed-add-if-not-exists
...
Replace value for BLOCKING_ENABLED, add if it does not already exist
2022-02-01 07:45:34 +01:00
d956498c8c
Merge pull request #4575 from pi-hole/fix/tag_update
...
Fix updating based on tags on older git versions by doing a full fetch
2022-02-01 07:44:23 +01:00
e09dd56807
Remove RPM package sqlite as well
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2022-02-01 07:38:57 +01:00
30ec1c94cc
Merge pull request #4593 from pi-hole/master
...
sync: master to development
2022-02-01 07:37:47 +01:00
5d68dac90e
Merge pull request #4588 from pi-hole/stale
...
Fix stale label to stale
2022-01-31 19:25:28 +00:00
77e5121d43
Split new function out into a separte utility script and add a test for it. Can be used in future to organise re/commonly-used code
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2022-01-30 23:05:28 +00:00
74d7d10554
Orphans need to be deleted in the old database
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2022-01-30 21:09:24 +01:00
2f4c4d9176
Fix stale label to stale
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2022-01-30 20:13:10 +01:00
1dd9d55d82
Replace value for BLOCKING_ENABLED (and QUERY_LOGGING, for consistency) and if value that we are trying to replace does not exist, add it to the end of the file.
...
Co-authored-by: MichaIng <micha@dietpi.com >
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2022-01-30 15:53:03 +00:00
8cbffa179d
Replace remaining sqlite3 calls by calls to our embedded pihole-FTL sqlite3 engine and remove sqlite3 as dependency in the installer.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2022-01-30 11:18:17 +01:00
5bb79de70b
Clean possible leftovers in domainlist_by_group, adlist_by_group, and client_by_group before copying from database base to avoid foreign key violations.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2022-01-30 10:38:24 +01:00
534f9a63bf
Copy database tables earlier into the new gravity database to avoid foreign key contraint violations when adding gravity entries refering to an empty adlist table
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2022-01-30 10:36:20 +01:00
f0f5cc52d9
Use internal SQLite3 engine in more places in gravity.sh
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2022-01-29 22:39:45 +01:00
bad6d8a59e
add parameter to set filename for teleporter
...
Make it possible to write pihole -a -t myname.tar.gz to configure the filename however you want
Signed-off-by: Lukas Schlötterer <80917404+lschloetterer@users.noreply.github.com >
2022-01-28 16:26:57 +01:00
7aa28e4a3a
Do a full fetch
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2022-01-22 22:09:15 +01:00
e80a7731c9
Merge pull request #4568 from pi-hole/master
...
sync: master to development
2022-01-16 16:26:50 +00:00
3cd662eaeb
Merge pull request #4558 from pi-hole/stale
...
Change the exemption issue label pinned to internal for stale issues
2022-01-16 14:59:17 +00:00
6ead24b315
Move space into variable ( #4562 )
...
Signed-off-by: rdwebdesign <github@rdwebdesign.com.br >
2022-01-14 17:00:34 +01:00
cdde832ed3
Some use uppercase some don't...
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2022-01-13 09:16:31 +01:00
57ba60ce54
Change the exemption issue label pinned to internal for stale issues
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2022-01-13 09:13:40 +01:00
ed6b85241b
use sed substitute instead of delete and append ( #4555 )
...
* use sed substitute instead of delete and append
doesn't move the line to the end of the file, instead keeps the order of the lines in setupVars.conf intact
Signed-off-by: Lukas Schlötterer <80917404+lschloetterer@users.noreply.github.com >
* Match start of line
as suggested in the review
Signed-off-by: Lukas Schlötterer <80917404+lschloetterer@users.noreply.github.com >
Co-authored-by: yubiuser <ckoenig@posteo.de >
Co-authored-by: yubiuser <ckoenig@posteo.de >
2022-01-12 09:23:13 +01:00
918f7a504c
Merge pull request #4554 from pi-hole/master
...
sync: master to development
2022-01-11 19:20:18 +00:00
3260cb40b5
ops per run -> 300 for stale
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2022-01-11 19:17:29 +00:00
a79c1159a9
Merge pull request #4550 from pi-hole/master
...
sync: master to development
2022-01-11 09:11:51 +00:00
65a04246cd
Merge pull request #4548 from pi-hole/actions/sync-to-dev
...
[Maintenance] Sync Master back to Dev when code is pushed to master
2022-01-11 09:10:59 +00:00
f1245685dc
Add action to automatically sync master to dev when code is pushed to master
...
Add in a release.yml to ignore github-actions author when auto-generating release notes
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2022-01-11 08:53:35 +00:00
ec3a5c2989
Merge pull request #4543 from pi-hole/tweak/debug_ipaddr
...
Include ip addr show and ip route show in debug log
2022-01-09 12:53:37 +01:00
b20b38d44f
Include ip addr show and ip route show for us to help with local-service issues (where hops-away is measured)
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2022-01-09 12:38:22 +01:00
d5253f26f4
Merge pull request #4542 from pi-hole/remove_oneline
...
Remove oneline from ss call
2022-01-09 11:39:33 +01:00
a65a841c56
Remove oneline from ss call
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2022-01-09 07:13:51 +01:00
1b0b24daf5
Merge pull request #4539 from pi-hole/master
...
Sync Master -> Dev
2022-01-08 22:35:46 +00:00
7010ed454c
Merge pull request #4532 from MichaIng/patch-1
...
Install netcat-openbsd as dependency explicitly
2022-01-08 15:17:01 +00:00
ce86157067
Fix gravity in case there are no adlists at all or all are disabled ( #4535 )
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2022-01-08 14:15:26 +01:00
3097c8fbdc
Skip the required ports check if installed in docker container. Unpriv'ed containers do not have access to the information required to resolve the service name listening - and the container should not start if there was a port conflict anyway ( #4536 )
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2022-01-08 13:57:49 +01:00
363e2f10bb
Merge pull request #4534 from pi-hole/meta/enable_stale
...
Enable Stale Action for live use
2022-01-08 11:42:48 +00:00
bfd9fe80ef
Remove debug from Stale
...
Put Stale in to action.
2022-01-08 01:42:35 -08:00
c2080324b7
Install netcat-openbsd as dependency explicitly
...
Since Debian Stretch and Ubuntu Bionic, the "netcat" package is a transitional dummy package which pulls in "netcat-traditional" on Debian Stretch+Buster and Ubuntu Bionic, and "netcat-openbsd" on Debian Bullseye, Ubuntu Focal and up.
On Debian Bookworm (testing), however, the "netcat" package has been removed during the last 3 days at time or writing, so that it fails do be installed. While "netcat-traditional" and "netcat-openbsd" both "Provides: netcat", since it's two alternatives, APT does not automatically pick one but aborts, and the only solution is to install one explicitly.
While this is likely a temporary state of the Debian testing suite, having a closer look at the two alternatives shows that "netcat-openbsd" is a much more actively maintained newer version with additional support for IPv6, proxies, and UNIX sockets, which is likely the reason for the gradual transition via meta package from "netcat-traditional" to "netcat-openbsd". This commit hence consequently follows this aim by skipping the transitional dummy package and installing "netcat-openbsd" explicitly as dependency, to avoid any possible errors like the one which occurs currently on Bookworm.
Both packages can be installed concurrently and do no conflict, but are managed via dpkg's "update-alternatives".
For reference:
- https://packages.debian.org/netcat
- https://packages.ubuntu.com/netcat
Signed-off-by: MichaIng <micha@dietpi.com >
2022-01-07 18:55:15 +01:00
