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
81698ef1ed
Fix Pi-hole status in chronometer
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2022-01-05 21:09:57 +01:00
5823f5e254
Use ss instead of lsof ( #4518 )
...
* Use ss instead of lsof for pihole status checks
Signed-off-by: DL6ER <dl6er@dl6er.de >
* Use ss FILTER instead of piping into bash
Signed-off-by: DL6ER <dl6er@dl6er.de >
* Use ss in debug log generation
Signed-off-by: DL6ER <dl6er@dl6er.de >
* Remove lsof from dependencies
Signed-off-by: DL6ER <dl6er@dl6er.de >
2022-01-05 16:41:46 +00:00
7807a93e10
If PIHOLE_DOCKER_TAG is set, then include that info in the debug run ( #4515 )
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2022-01-04 21:46:06 +00:00
c6a2a6f739
Install pihole-FTL.conf template on fresh installation ( #4496 )
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2022-01-04 19:09:30 +00:00
241e53ed45
Skip debug upload question if called from web interface ( #4494 )
...
* Skip debug upload question if called from web interface
Signed-off-by: Christian König <ckoenig@posteo.de >
* Suppress upload error if users opt-out from uploading from web interface
Signed-off-by: Christian König <ckoenig@posteo.de >
* Fix and reverse logic
Signed-off-by: Christian König <ckoenig@posteo.de >
* Remove addtional space
Signed-off-by: Christian König <ckoenig@posteo.de >
* Include reviewer's comment :D
Co-authored-by: Adam Warner <me@adamwarner.co.uk >
Co-authored-by: Adam Warner <me@adamwarner.co.uk >
2022-01-04 19:06:41 +00:00
920cf6de14
Check for updates on master based on tags not commits ( #4475 )
...
* Check for updates on master based on tags not commits
Signed-off-by: Christian König <ckoenig@posteo.de >
* Fix stickler
Signed-off-by: Christian König <ckoenig@posteo.de >
* Address reviewer's comments
Signed-off-by: Christian König <ckoenig@posteo.de >
* Fix stickler again
Signed-off-by: Christian König <ckoenig@posteo.de >
* Use local git instead of relying on github
Signed-off-by: Christian König <ckoenig@posteo.de >
* Add --tags
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com >
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com >
2021-12-22 18:21:44 +00:00
1eb31174a5
Merge pull request #4455 from pi-hole/comment
...
Add comment help text to list function
2021-12-21 22:26:05 +01:00
ff4487ff74
Escape quotes
...
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com >
2021-12-21 22:10:56 +01:00
669f1b0f4a
Address reviewer's comment
...
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com >
2021-12-21 12:58:39 +01:00
31de661bbb
Merge pull request #4414 from pi-hole/debug/custom.list
...
Add custom.list (Local DNS Records) to debug log
2021-12-21 12:37:11 +01:00
3a67d1cf8d
Merge pull request #4461 from pi-hole/qr_iframe
...
Companion to pi-hole/adminlte #1996
2021-12-20 21:51:05 +01:00
c0f454ddfa
Add new interface listening option "bind" ( #4476 )
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-12-20 21:36:19 +01:00
28085cf7d8
Merge iFrame exceptions
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-12-17 10:08:16 +01:00
2eff53b2bb
Allow qr code iframe
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-12-10 07:17:53 +01:00
8d6ce78c65
Allow qr code iframe
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-12-10 07:09:42 +01:00
b52a3a021d
Add comment help text to list function
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-12-06 20:30:37 +01:00
ba6d700e7e
Fix pihole -v output if WebAdmin not installed ( #4370 )
...
* Fix https://github.com/pi-hole/pi-hole/issues/4279
Signed-off-by: Subhaditya Nath <sn03.general@gmail.com >
* Don't ignore exit code of version.sh
If it exits with a non-zero return code, that means some error occurred,
and so it shouldn't be ignored.
Signed-off-by: Subhaditya Nath <sn03.general@gmail.com >
* Implement changes suggested by @Michalng
Signed-off-by: Subhaditya Nath <sn03.general@gmail.com >
* Implement changes suggested by @PromoFaux
Signed-off-by: Subhaditya Nath <sn03.general@gmail.com >
* Always source /etc/pihole/setupVars.conf
https://github.com/pi-hole/pi-hole/pull/4370#issuecomment-978149567
Co-authored-by: Adam Warner <me@adamwarner.co.uk >
2021-12-02 20:46:11 +00:00
bc8150adfa
Clean up bash script formatting
...
Done with the help of beautysh (a python-based bash formatter)
Signed-off-by: jbzdarkid <jbzdarkid@gmail.com >
2021-11-25 14:12:09 -08:00
e733553295
Remove unused code from webpage.sh
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-11-02 21:22:14 +01:00
c6da1a3918
Fix documentation; add some missing zones
...
Signed-off-by: David Irvine <aviddiviner@gmail.com >
2021-10-28 12:09:34 +02:00
c1eb35a35e
Add custom.list (Local DNS Records) to debug log
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-10-26 22:46:52 +02:00
596689b4c9
Validate host/domain of Local DNS records as well
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-10-19 21:34:16 +02:00
a872fabe7d
Validate on removal as well
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-10-17 20:56:08 +02:00
bc21a7155d
Add option to not reload
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-10-12 19:53:59 +02:00
b7bba6a689
Validate when adding not when removing
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-10-12 19:32:55 +02:00
16fb6665ec
Merge pull request #4380 from pi-hole/df
...
Include df -h in debug log
2021-10-11 19:09:22 +02:00
d84da71310
Only show lines not containing sensitive keywords
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-10-11 18:02:47 +02:00
77a30ac0c2
Use mapfile
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-10-11 17:31:03 +02:00
19ae9d3ee6
Merge pull request #4375 from pi-hole/companion/adminlte-1231
...
Companion to pi-hole/adminlte #1231
2021-10-10 19:03:59 +02:00
d03aa0c0c7
Merge pull request #4379 from pi-hole/tweak/vw_adlist
...
Simplify vw_adlist
2021-10-10 07:11:05 +02:00
3c41ec08a3
Set file permission for querie database in pihole-FTL.service ( #4328 )
...
* Set file permission for querie database in pihole-FTL.service
Signed-off-by: Christian König <ckoenig@posteo.de >
* Use -f flag for chmod of the macvendor.db
Signed-off-by: Christian König <ckoenig@posteo.de >
* Fix missing space
Signed-off-by: Christian König <ckoenig@posteo.de >
* Fix spelling
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-10-08 22:54:23 +01:00
fdc4cf9869
Fix stickler
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-10-08 21:54:50 +02:00
a0ecfcc1dc
Include df -h in debug log
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-10-08 21:50:46 +02:00
b30d729aa4
Simplify vw_adlist
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-10-08 21:08:10 +02:00
f8af1a1baa
Allow iFrame for teleporter.php, see https://github.com/pi-hole/AdminLTE/pull/1231
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2021-10-07 00:16:07 +01:00
f3acc7c839
Make debug log file size human readable ( #4350 )
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-10-06 15:19:25 -07:00
55dce14655
Add execution bit accidentally dropped in #4106 ( #4368 )
...
Add some smoke tests for the repository.
- Add x bit to piholeCheckout.sh. Possibly not needed, but consistency is no bad thing
- Ensure all files in script directorys have executable bit set
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2021-10-05 19:34:51 +01:00
541257849d
List fix: no reload ( #3981 )
...
* scripts/list: Fixed --noreload options
We should differentiate the ability and the needings.
Signed-off-by: Andras Tim <andras.tim@gmail.com >
* scripts/list: Removed unnecessary tailing whitespaces
Signed-off-by: Andras Tim <andras.tim@gmail.com >
* Update advanced/Scripts/list.sh
Signed-off-by: Andras Tim <andras.tim@gmail.com >
* Merge bash conditions according to MichaIng suggestion
Co-authored-by: micha@dietpi.com
Signed-off-by: Andras Tim <andras.tim@gmail.com >
2021-10-05 15:52:51 +01:00
38bb4a4908
Remove unused wildcard_regex_converter.sh ( #4369 )
...
* Remove unused wildcard_regex_converter.sh
Signed-off-by: Christian König <ckoenig@posteo.de >
* Remove regexconverter
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-10-05 13:09:16 +01:00
b755330f4c
Remove local-ttl from set of default dnsmasq options.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-09-24 11:34:05 +02:00
6d670991c3
Perform a check of required packages befor updating pihole ( #4326 )
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-09-12 13:38:55 -07:00
62f29ba3fa
Merge branch 'release/v5.4' into development
2021-09-11 21:35:11 +01:00
89b1cfcd85
Merge pull request #4243 from yubiuser/debug_dnsmasq
...
Include all files in the dnsmasq config dir in the debug output
2021-09-11 22:20:00 +02:00
89e187947e
Merge pull request #4282 from pi-hole/new/RFC6761
...
Install RFC6761 config file
2021-09-11 20:44:46 +01:00
d2faa93241
Merge pull request #4314 from pi-hole/fix/capabilities
...
Add possibly missing capabilities
2021-09-11 20:44:24 +01:00
0df099a6a5
Merge pull request #4312 from yubiuser/debug_dnsmasq.conf
...
Add content of /etc/dnsmasq.conf to debug output
2021-09-11 21:42:36 +02:00
482ac12c9b
Merge pull request #4275 from MichaIng/patch-4
...
Remove ineffective Access-Control-Allow-Origin header
2021-09-11 21:41:49 +02:00
d0e8b0c962
Forward unqualified names to the CF target only when the "Never forward non-FQDN" option is NOT ticked
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-09-09 20:28:33 +02:00
d48d3aba69
Merge pull request #4305 from pi-hole/tweak/debug_curl
...
Use --no-progress-meter instead of --silent so error reasons are printed
2021-09-07 09:33:25 -07:00
Adam Warner