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
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
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
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
c35ed68051
Allow `pihole -q` matching ABP subdomains
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2023-03-14 17:31:39 -03:00
75a32d22a3
Allow limited parsing of ABP style adlists ( #5179 )
2023-03-14 13:23:03 -07:00
71e262c37f
Revert "Allow final dot (root zone)"
...
This reverts commit 0b5da9f0da
2023-03-14 19:50:53 +01:00
309ee78903
Use distinct variabled
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-03-07 20:40:16 +01:00
d6f5552ccf
Convert domain to lowercase in pihole -q
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-03-06 21:52:54 +01:00
c5faf3d174
Use ',' as the separator char in query rather than the default '|' as we now expect some valid results to contain '|'
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-02-22 21:21:38 +01:00
4fd0f15d90
Ignore commented lines when reding PRIVACYLEVEL from config file
...
Create dedicated getVal function in utils.sh as it might be useful somewhere else
Account for tailing comments and $key not being on the first line
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-02-21 21:03:55 +01:00
18ab94135f
Show all files (not their content) of the lighttpd config dirs
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-01-24 23:02:38 +01:00
be0efa2332
Add lighttpd selftest
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-01-24 22:19:24 +01:00
9bde5de601
Use conf-enabled instead of conf-available
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-01-24 21:59:13 +01:00
e59f5db145
Add pihole-admin.conf to debug log
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-01-22 22:37:19 +01:00
d349a4640f
Remoce leftover from query.sh
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-01-12 20:24:08 +01:00
fc83883934
Apply suggestions from code review
...
Co-authored-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
2022-12-11 17:48:45 +00:00
1550f29f06
Use GREEN if dig was successful
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2022-12-11 14:42:47 -03:00
a206980242
Fix parenthesis color
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2022-12-11 14:42:47 -03:00
8c2f56b0e6
Imporving the output from `os_check()` function
...
- add red color to dig errors
- reorder some output lines
- add "Distro and version supported" on success
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2022-12-11 14:42:46 -03:00
b4349b41ce
Use the correct variable `digReturnCode`
...
also use INFO instead of CROSS, because it's not an error.
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2022-12-11 14:42:46 -03:00
67f04787d6
Only compare OS versions if `dig` was successful
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2022-12-11 14:42:35 -03:00
38775cffdf
Ensure local hash is always of length 8, for consistency.
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-11-14 22:51:39 +00:00
ba74051502
Grab local FTL hash correctly from FTL's own version output, and grab one digit less for remote hashes (also in debug log)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-11-14 22:09:26 +00:00
cdbe4c9b86
Get only the precise tag number when getting local version, do not show branch name when on master branch(es)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-11-14 20:39:34 +00:00
7536c312ee
Correctly identify process status in debug script on docker
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-11-13 21:53:59 +01:00
a8b6eb9b70
Touch files before addKey or addOrEditKeyValPair ( #4999 )
2022-11-09 23:37:30 +00:00
67385b7ed4
Touch files before addKey or addOrEditKeyValPair
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-11-09 21:25:09 +01:00
64e61aac4a
Simplify versions.sh ( #4959 )
2022-11-09 17:15:51 +00:00
3491dbfd04
Check `versions` file on the debug log ( #4977 )
2022-10-31 13:25:15 -07:00
01bf9ca42a
Prevent CNAME loop ( #4988 )
2022-10-29 15:44:03 +02:00
c8c6533440
Add small explanation.
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-10-29 15:09:14 +02:00
f1b15f7e92
Remove check for latest component version in debug log ( #4973 )
2022-10-28 17:27:05 -07:00
e0c351f0e4
Remove unused possibility to obfuscate pihole.log in debug log ( #4974 )
2022-10-28 13:16:30 -04:00
128a3ab1be
Go POSIX
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-10-22 22:39:42 +02:00
df3e9e5f51
Disable shellcheck as it suggests a bashism
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-10-22 22:25:40 +02:00
c322458dcb
Escape dots in local DNS records/CNAMES before removing them
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-10-21 13:02:21 +02:00
21be1bd58e
Prevent CNAME loop
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-10-20 07:29:14 +02:00
4c9401175c
Remove check for latest version
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-10-15 09:06:57 +02:00
235673dac8
Remove unused possibility to obfuscate pihole.log
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-10-15 08:58:12 +02:00
d737948f64
Add `versions` file to the REQUIRED_FILES list
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2022-10-14 14:11:19 -03:00
52283478c8
Run pihole updatechecker if versions file is not found
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-10-14 13:26:06 +02:00
c84be5de61
Reorganize by component rather then source
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-10-14 13:18:12 +02:00
d85982dc51
Use versions file instead of github api to get latest version
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-10-14 10:29:14 +02:00
5c61f6cb65
Remove checkout hint
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-10-14 08:43:39 +02:00
4c0a94d2b9
Don't rely on pihole -v output but query github to get the lastest versions in debug script
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-10-13 14:44:13 +02:00
9471c69882
Fix spelling
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-10-07 09:34:05 +02:00
79c0b446e1
Set missing data to N/A
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-10-06 21:55:49 +02:00
a478f2460b
POSIX
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-10-06 21:50:07 +02:00
2dc599f266
Simplify version.sh
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-10-06 17:58:58 +02:00
d7f7ef9965
Only create VERSION_FILE if it does not exist
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-10-06 14:37:56 +02:00
888e44e53d
Add hash functions to updatecheck
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-10-06 14:34:34 +02:00
18d28533eb
Update local and remote versions at the same time
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-10-06 12:36:17 +02:00
56527e5dd9
Add get_remote_version() to updatechecker
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-10-06 12:03:12 +02:00
b7b5ffa8dd
remove old code per review from @yubiuser and @dschaper
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-10-01 22:31:03 +01:00
34b66002e9
`leasetime` (local) should have an `h` after it to signify 24h lease, else it will be read as two minutes (minimum integer value)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-10-01 22:31:00 +01:00
276c480f50
Return default port if non-numeric characters are set in pihole-FTL.conf for FTLPORT. FTL does the same in such case and provide the API on 4711
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-09-26 23:40:09 +02:00
25ba68104b
Remove last traces
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-09-26 22:55:34 +02:00
3d01e4d0cf
No detour - use pihole-FTL.conf to get the API port number
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-09-26 22:55:30 +02:00
f8a12917e2
Handle more than one default gateway in debug script ( #4934 )
2022-09-25 11:09:26 -07:00
37b45d411d
Read docker tag from file in root, not the previously set environment variable ( #4929 )
2022-09-25 11:05:08 -07:00
22ebf21487
Use POSIX
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-09-25 18:20:01 +02:00
9debd22179
If, after reading /pihole.docker.tag into DOCKER_TAG, it does not match an expected pattern, unset it - this should prevent arbitary code from being run
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-09-25 15:51:09 +01:00
951b4ed002
Remove cronjob that checks local versions every 10 minutes - only check when required ( #4939 )
...
* eliminate updatechecker local from pihole cron job
Signed-off-by: jpgpi250 <jpgpi250@gmail.com>
* resolving stickler-ci items
Signed-off-by: jpgpi250 <jpgpi250@gmail.com>
* undo changes to updatecheck.sh (request from PromoFaux)
Signed-off-by: jpgpi250 <jpgpi250@gmail.com>
* applied recommendation from PromoFaux
Signed-off-by: jpgpi250 <jpgpi250@gmail.com>
* Indent the code inside the function
Signed-off-by: jpgpi250 <jpgpi250@gmail.com>
* removed unnecessary updatecheck for core
Signed-off-by: jpgpi250 <jpgpi250@gmail.com>
* eliminate updatechecker local from pihole cron job
Co-authored-by: jpgpi250 <jpgpi250@gmail.com>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
Signed-off-by: jpgpi250 <jpgpi250@gmail.com>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
2022-09-24 16:14:44 +01:00
9463c3c69f
Change wording in chronometer ( #4910 )
2022-09-24 13:53:08 +01:00
bb57a9e616
Handle more than one default gateway in debug script
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-09-22 22:33:11 +02:00
b6d1bd7335
Read docker tag from file in root, not the previously set environment variable
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-09-19 22:01:05 +01:00
60c35cb93c
Remove unused check_database_integrity()
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-09-18 13:08:44 +02:00
2c3fea321b
Remove FAQ_ULA as it is unused in `core`
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-09-18 09:10:24 +02:00
40f00c6f0b
Fix gravity database integrity check
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-09-18 09:01:22 +02:00
00e51f32b5
Blcked => Block
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-09-17 16:46:31 +02:00
f90fb8b946
Change wording in chronometer
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-09-17 16:24:31 +02:00
5cc317de5b
Change texts after Block Page removal
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2022-09-16 03:16:54 -03:00
3d53bda121
Update advanced/Scripts/updatecheck.sh
...
Co-authored-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
2022-09-15 17:54:54 +01:00
760325eb76
Update piholeDebug to source versions file for DOCKER_VERSION instead of reading PIHOLE_DOCKER_TAG
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-09-14 22:49:37 +01:00
bf256aa5a7
If docker version env var is set, store it in /etc/pihole/versions file for later use
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-09-14 22:38:41 +01:00
49b9dc8888
Remove json_extract function
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-08-25 09:55:47 +02:00
66eeee5548
Remove the email function ( #4870 )
...
- **What does this PR aim to accomplish?:**
We offered to set an administrator email which was shown on the blockpage. With the removal of the blockpage (https://github.com/pi-hole/pi-hole/pull/3910 ) this function is not needed anymore.
Corresponding web interface PR: https://github.com/pi-hole/AdminLTE/pull/2301
2022-08-24 07:21:04 +02:00
a4b899c256
Review suggestions (and shellcheck complaints)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-23 19:10:12 +01:00
5421aad03e
Store versions as key/value pairs rather than space delimeted values
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-22 19:11:27 +01:00
8c4a9aa6e3
Remove the email function
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-08-17 23:14:56 +02:00
114f562758
Merge branch 'development' into removeblockpagefunctionality
2022-08-17 20:25:03 +01:00
e35a9da921
Remove the blockpage-focussed customisations to query.sh
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-08 18:57:55 +01:00
b98e331375
Only do one curl call in debug when checking the X-Header
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-08-08 17:20:41 +01:00
5d5a85b7b6
X-Pi-hole removed from blocking page...
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-08 17:12:16 +01:00
d77677312c
Extend FTL information in debug log
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-08-08 13:52:20 +02:00
0b81dd387b
type -> list_type per @yubiuser suggestion
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-01 20:56:37 +01:00
aa0a9e2976
Merge pull request #4839 from pi-hole/move_getFTLPIDFile
...
Move FTL port and PID functions to utils.sh
2022-07-30 21:01:21 +02:00
567a915336
Remove unused and outdated files and scripts
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-07-29 23:21:38 +02:00
7b77d991df
Move FTL port and PID functions to utils.sh
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-07-26 14:38:03 +02:00
d89720330f
Address revision requests:
...
- replace `local var` with `_var` (POSIX style);
- move inline comments
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2022-07-24 20:15:20 -03:00
8d1f286f30
Only execute spinner function if there is a tty
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2022-07-24 17:52:17 -03:00
cbcd12631d
Adding the spinner for foreign_key_check too
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2022-07-11 01:53:30 -03:00
c4f9a475f3
Debug log - add spinner for long processes
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2022-07-11 01:34:51 -03:00
b486786041
Add database healthy checks to debug script
...
Fix health check output comparison in gravity script as well
Add note about waiting time
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-07-10 23:32:47 +02:00
8e4adb6e39
Merge pull request #4788 from pi-hole/SKIP_INSTALL
...
Rename PH_TEST to SKIP_INSTALL
2022-07-09 00:01:48 +02:00
b49db58ec2
Fix spelling mistakes
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-07-08 22:00:36 +02:00
518cbd10e0
Rename also in docker files
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-07-06 22:58:14 +02:00
0a8761ee68
Rename PH_TEST to SKIP_INSTALL
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-07-06 22:53:09 +02:00
469776afd6
Do not restrict RegEx added from CLI by length
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-07-06 19:27:33 +02:00
98c238064e
Change FTL's default log file path from /var/log/pihole/pihole-FTL.log to /var/log/pihole/FTL.log
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-07-03 18:43:45 +02:00
0be987239e
Adds spellcheck action to the smoke-tests (also moves editorconfig-checker to smoketests away from it's own action)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-07-02 14:04:08 +01:00
73d5902bed
Add editorconfig-checker workflow
...
Add yml style to editorconfig
Add markdown styling to editorconfig
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-07-02 09:36:52 +02:00
dcea3cf2c6
Merge branch 'development' into drop_fedora
2022-06-27 11:48:26 -07:00
f9d1893f96
Update test to reflect currently supported OS
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-06-20 10:34:32 +02:00
954a0c2a14
Remove read permission for others on senible log files
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-06-19 23:09:05 +02:00
67f5f16f84
Merge branch 'development' into fix-ipv6
2022-06-02 12:24:01 -07:00
ae9d16baf2
Merge pull request #3732 from pi-hole/tweak/moveloglocation
...
Utilise /var/log/pihole/ for log storage
2022-05-31 22:59:32 +02:00
300c7b1518
Do not hardcode webroot dir for teleporter
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-05-31 14:11:39 +02:00
dae96e7384
Change lighttpd log file names
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-05-29 21:04:18 +02:00
52c3df1a8e
lighttpd log dir is now different than Pi-hole log dir
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-05-28 21:21:48 +02:00
82695aba7d
update LOG_DIRECTORY variable in debug script
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-05-15 07:09:27 +02:00
36dd533ef3
use directory /var/log/pihole/ for log storage
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-05-15 06:46:23 +02:00
f7c800863e
Remove DHCPv6, use leasetime from interface ( #4507 )
...
Signed-off-by: Omoeba <38597972+Omoeba@users.noreply.github.com>
2022-05-11 11:57:42 -07:00
d78c689e55
no more alphabetical order
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-04-21 19:56:21 +01:00
c9e76c978e
Update advanced/Scripts/webpage.sh
...
Co-authored-by: yubiuser <ckoenig@posteo.de>
2022-04-17 13:39:55 +01:00
23e6fa1ec5
Replace wrapper function calls with direct utils.sh calls. Leave warpper functions until next release as docker currently uses them, and new changes to utils.sh need to be in the `master` branch before docker can use them
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-04-15 09:50:40 +01:00
db116971ce
I tried to do too many things in one function, vastly overcomplicating what should have been _this_ all along
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-04-14 22:53:38 +01:00
86dd612882
remove `readonly` directive from declaration of `utilsfile`, it is unnecassery
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-04-12 17:13:50 +01:00
d3e94cbceb
Merge pull request #4653 from pi-hole/refactor-utils-redux
...
Tweaks to functions in utils.sh and refactored usages in webpage.sh
2022-04-04 23:25:54 +02:00
9b4f6c84cd
Minor review comments
2022-04-04 23:14:10 +02:00
4d31d5ee11
Address review comments
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-04-04 22:02:26 +01:00
e4a1f3a175
Rename block lists to adlists within the query list functions
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-04-04 13:52:26 +02:00
0d74b27101
Merge pull request #4646 from pi-hole/tweak/debug_message
...
Pool identical messages in debug output
2022-04-02 13:14:44 +01:00
7fa8cdd03e
Address:
...
- Review Comments
- Stickler Complaints
2022-04-02 12:46:07 +01:00
5cebceadda
Remove `@` and following character from interface name
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2022-03-30 21:32:18 -03:00
59fc3804be
Make utils.sh posix compatible per request
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-03-16 20:40:25 +00:00
48138d32b6
Adjust addOrEditKeyValPair to optionally take two or three arguments (adjust test to suit)
...
Add a removeKey function with test
update webpage.sh to reference functions in utils.sh (this can likely be abstracted/refactored further)
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-03-16 17:42:01 +00:00
48136c5bbc
Add last timestamp
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-03-14 19:54:46 +01:00
0219e5dfe0
Pool identical messages in debug output
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-03-12 21:00:48 +01:00
0631cb4984
Merge pull request #4645 from rdwebdesign/color_debug_web
...
Generate colorful debug logs to web interface
2022-03-12 18:02:49 +00:00
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>
2022-03-12 02:58:46 -03:00
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>
2022-02-27 18:16:53 +01:00
Adam Warner
Christian König
MrDuck2742
ipitio
Adam Warner
Dan Schaper
RD WebDesign
William Blew
DL6ER
Peter Russell
DL6ER
Omoeba