mirror of
https://github.com/pi-hole/pi-hole.git
synced 2024-11-15 02:42:58 +00:00
Merge pull request #4771 from pi-hole/action/ediorconfig-checker
Action/editorconfig checker
This commit is contained in:
commit
75f40e7160
8 changed files with 25 additions and 7 deletions
|
@ -12,3 +12,9 @@ indent_size = tab
|
||||||
tab_width = 4
|
tab_width = 4
|
||||||
charset = utf-8
|
charset = utf-8
|
||||||
trim_trailing_whitespace = true
|
trim_trailing_whitespace = true
|
||||||
|
|
||||||
|
[*.yml]
|
||||||
|
tab_width = 2
|
||||||
|
|
||||||
|
[*.md]
|
||||||
|
tab_width = 2
|
||||||
|
|
14
.github/workflows/editorconfig-checker.yml
vendored
Normal file
14
.github/workflows/editorconfig-checker.yml
vendored
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
name: editorconfig-checker
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
push:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
name: editorconfig-checker
|
||||||
|
runs-on: ubuntu-20.04
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v3
|
||||||
|
- uses: editorconfig-checker/action-editorconfig-checker@main
|
||||||
|
- run: editorconfig-checker
|
|
@ -3,5 +3,3 @@
|
||||||
Please read and understand the contribution guide before creating an issue or pull request.
|
Please read and understand the contribution guide before creating an issue or pull request.
|
||||||
|
|
||||||
The guide can be found here: [https://docs.pi-hole.net/guides/github/contributing/](https://docs.pi-hole.net/guides/github/contributing/)
|
The guide can be found here: [https://docs.pi-hole.net/guides/github/contributing/](https://docs.pi-hole.net/guides/github/contributing/)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -16,4 +16,4 @@ CREATE TRIGGER tr_group_zero AFTER DELETE ON "group"
|
||||||
|
|
||||||
UPDATE info SET value = 12 WHERE property = 'version';
|
UPDATE info SET value = 12 WHERE property = 'version';
|
||||||
|
|
||||||
COMMIT;
|
COMMIT;
|
||||||
|
|
|
@ -15,4 +15,4 @@ CREATE TRIGGER tr_adlist_update AFTER UPDATE OF address,enabled,comment ON adlis
|
||||||
|
|
||||||
UPDATE info SET value = 13 WHERE property = 'version';
|
UPDATE info SET value = 13 WHERE property = 'version';
|
||||||
|
|
||||||
COMMIT;
|
COMMIT;
|
||||||
|
|
|
@ -93,4 +93,4 @@ CREATE VIEW vw_regex_blacklist AS SELECT domain, domainlist.id AS id, domainlist
|
||||||
|
|
||||||
UPDATE info SET value = 4 WHERE property = 'version';
|
UPDATE info SET value = 4 WHERE property = 'version';
|
||||||
|
|
||||||
COMMIT;
|
COMMIT;
|
||||||
|
|
|
@ -35,4 +35,4 @@ CREATE TABLE client_by_group
|
||||||
|
|
||||||
UPDATE info SET value = 5 WHERE property = 'version';
|
UPDATE info SET value = 5 WHERE property = 'version';
|
||||||
|
|
||||||
COMMIT;
|
COMMIT;
|
||||||
|
|
|
@ -89,7 +89,7 @@ getFTLAPIPort(){
|
||||||
# -s: FILE exists and has a size greater than zero
|
# -s: FILE exists and has a size greater than zero
|
||||||
ftl_api_port=$(cat "${PORTFILE}")
|
ftl_api_port=$(cat "${PORTFILE}")
|
||||||
# Exploit prevention: unset the variable if there is malicious content
|
# Exploit prevention: unset the variable if there is malicious content
|
||||||
# Verify that the value read from the file is numeric
|
# Verify that the value read from the file is numeric
|
||||||
expr "$ftl_api_port" : "[^[:digit:]]" > /dev/null && unset ftl_api_port
|
expr "$ftl_api_port" : "[^[:digit:]]" > /dev/null && unset ftl_api_port
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue