RD WebDesign
40b96e673b
Allows colorful debug logs via web interface
...
Note: needs the AdminLTE code changes to work.
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
3 years ago
Adam Warner
36ca858668
Merge pull request #4641 from pi-hole/master
...
sync: master to development
3 years ago
Adam Warner
899cac0aac
Ignore Documentation Needed label
3 years ago
Adam Warner
16b732fe8a
Merge pull request #4629 from pi-hole/tweak/api_port
...
Tweak/api port
3 years ago
DL6ER
1bf2f8d0b7
Merge pull request #4635 from pi-hole/procps
...
Add procps to dependencies
3 years ago
Christian König
c756bcb9d1
Add procps to dependencies
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Christian König
42424b515b
Add getFTLAPIPort function
...
Add ftl_api_port function
Signed-off-by: Christian König <ckoenig@posteo.de>
Use getFTLAPIPort in pihole
Signed-off-by: Christian König <ckoenig@posteo.de>
Use default portfile as fallback
Signed-off-by: Christian König <ckoenig@posteo.de>
Fix stickler
Signed-off-by: Christian König <ckoenig@posteo.de>
Correct variables
Signed-off-by: Christian König <ckoenig@posteo.de>
Apply suggestions from code review
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
Add test getFTLAPIPort returing default port
Signed-off-by: Christian König <ckoenig@posteo.de>
Remove unused code from test_key_val_replacement_works
Signed-off-by: Christian König <ckoenig@posteo.de>
Add getFTLAPIPort_custom test
Signed-off-by: Christian König <ckoenig@posteo.de>
Fix output format
Signed-off-by: Christian König <ckoenig@posteo.de>
Add debugging
Signed-off-by: Christian König <ckoenig@posteo.de>
Remove debugging and fix function
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Adam Warner
bd956b5f16
Merge pull request #4625 from pi-hole/master
...
sync: master to development
3 years ago
Adam Warner
9be5199f7c
remove the CONTENT_COMPARISON setting (defaults to false)
3 years ago
yubiuser
9db19c5e96
Merge pull request #4621 from pi-hole/new/set_rate_limit
...
Add backend option to set rate-limit from the dashboard
3 years ago
DL6ER
91b4233d3a
Add backend option to set rate-limit from the dashboard
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
Adam Warner
0b905c28c1
Merge pull request #4609 from pi-hole/fix/flush
...
Fix log flush with new query database schema
3 years ago
Christian König
f4286a4d12
Fix log flush with new query database schema
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Adam Warner
6ffa2ba1b2
Merge pull request #4547 from pi-hole/development
...
Pi-hole Core v5.9
3 years ago
Adam Warner
e9250d62c5
Merge pull request #4598 from pi-hole/alt-4597
...
Use case insensitive deletion when removing custom CNAME/DNS records
3 years ago
Adam Warner
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>
3 years ago
Adam Warner
2bd670a3dd
Merge pull request #4582 from lschloetterer/patch-1
...
add parameter to set filename for teleporter
3 years ago
Adam Warner
f342b2c9f6
Merge pull request #4489 from pi-hole/tweak/manpages
...
Remove pihole-FTL.conf manpage
3 years ago
Lukas Schlötterer
2a0bb5b9ee
Create second entry for teleporter and adjust spacing
...
Signed-off-by: Lukas Schlötterer <80917404+lschloetterer@users.noreply.github.com>
3 years ago
yubiuser
c3c5342b48
Fix reviewer's comment
...
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
3 years ago
Christian König
d7d8e9730b
Remove pihole-FTL.conf.5 from automated tests
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Christian König
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>
3 years ago
Adam Warner
ee9f4856a2
Merge pull request #4596 from pi-hole/long-live-centos8-stream
...
Switch from centos8 to centos8:stream base image for centos 8 tests
3 years ago
Adam Warner
444526ad58
Switch from centos8 to centos8:stream base image for centos 8 tests
3 years ago
DL6ER
844c4dcdc8
Merge pull request #4584 from pi-hole/fix/gravity_internal_sqlite3
...
Replace calls to sqlite3 by calls to pihole-FTL sqlite3
3 years ago
Lukas Schlötterer
881d92632c
add hint for custom teleporter filename to help function
...
Signed-off-by: Lukas Schlötterer <80917404+lschloetterer@users.noreply.github.com>
3 years ago
DL6ER
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
3 years ago
DL6ER
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
3 years ago
DL6ER
e09dd56807
Remove RPM package sqlite as well
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
DL6ER
30ec1c94cc
Merge pull request #4593 from pi-hole/master
...
sync: master to development
3 years ago
Adam Warner
5d68dac90e
Merge pull request #4588 from pi-hole/stale
...
Fix stale label to stale
3 years ago
Adam Warner
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>
3 years ago
DL6ER
74d7d10554
Orphans need to be deleted in the old database
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
Christian König
2f4c4d9176
Fix stale label to stale
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Adam Warner
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>
3 years ago
DL6ER
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>
3 years ago
DL6ER
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>
3 years ago
DL6ER
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>
3 years ago
DL6ER
f0f5cc52d9
Use internal SQLite3 engine in more places in gravity.sh
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
Lukas Schlötterer
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>
3 years ago
Christian König
7aa28e4a3a
Do a full fetch
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Adam Warner
e80a7731c9
Merge pull request #4568 from pi-hole/master
...
sync: master to development
3 years ago
Adam Warner
3cd662eaeb
Merge pull request #4558 from pi-hole/stale
...
Change the exemption issue label pinned to internal for stale issues
3 years ago
RD WebDesign
6ead24b315
Move space into variable ( #4562 )
...
Signed-off-by: rdwebdesign <github@rdwebdesign.com.br>
3 years ago
Christian König
cdde832ed3
Some use uppercase some don't...
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Christian König
57ba60ce54
Change the exemption issue label pinned to internal for stale issues
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Lukas Schlötterer
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>
3 years ago
Adam Warner
918f7a504c
Merge pull request #4554 from pi-hole/master
...
sync: master to development
3 years ago
Adam Warner
3260cb40b5
ops per run -> 300 for stale
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
3 years ago
Adam Warner
a79c1159a9
Merge pull request #4550 from pi-hole/master
...
sync: master to development
3 years ago