diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile new file mode 100644 index 00000000..98212f28 --- /dev/null +++ b/.devcontainer/Dockerfile @@ -0,0 +1,7 @@ +FROM node:21-alpine3.18 +RUN apk add --no-cache \ + git \ + nano\ + openssh + +USER node diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 00000000..58e0d8b6 --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,23 @@ +{ + "name": "Pi-hole web devcontainer", + "dockerFile": "Dockerfile", + // Use 'postCreateCommand' to run commands after the container is created. + "postCreateCommand": "npm install", + "customizations": { + // Configure properties specific to VS Code. + "vscode": { + "settings": {}, + "extensions": [ + "eamodio.gitlens", + "EditorConfig.EditorConfig", + "github.vscode-github-actions" + ] + } + }, + "containerEnv": { + "GIT_EDITOR": "nano" + }, + "mounts": [ + "type=bind,source=/home/${localEnv:USER}/.ssh,target=/home/node/.ssh,readonly" + ] +} diff --git a/.editorconfig b/.editorconfig index 81d63a06..e0029320 100644 --- a/.editorconfig +++ b/.editorconfig @@ -17,7 +17,7 @@ indent_size = 2 [*.js] indent_size = 2 -[package.json] +[*.json] indent_size = 2 [.yamllint.conf] diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml index 05e5593f..e9222f63 100644 --- a/.github/workflows/codespell.yml +++ b/.github/workflows/codespell.yml @@ -1,6 +1,9 @@ name: Codespell on: + push: + branches: + - '**' pull_request: types: [opened, synchronize, reopened, ready_for_review] diff --git a/error403.lp b/error403.lp new file mode 100644 index 00000000..d071669f --- /dev/null +++ b/error403.lp @@ -0,0 +1,26 @@ + + +
+
+

403

+
+

Oops! Access denied.

+

+ You don't have permission to access on this server.
+ Did you mean to go to your Pi-hole's dashboard instead? +

+
+
+
+ + diff --git a/groups-clients.lp b/groups-clients.lp index 6cd2e222..86b7a082 100644 --- a/groups-clients.lp +++ b/groups-clients.lp @@ -41,7 +41,8 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
-

You can select an existing client or add a custom one by typing into the field above and confirming your entry with ⏎.

+

You can select an existing client or add a custom one by typing into the field above and confirming your entry with ⏎. + Multiple clients can be added by separating each client with a space or comma.

Clients may be described either by their IP addresses (IPv4 and IPv6 are supported), IP subnets (CIDR notation, like 192.168.2.0/24), their MAC addresses (like 12:34:56:78:9A:BC), diff --git a/groups-domains.lp b/groups-domains.lp index 784065ef..1fb0a7c0 100644 --- a/groups-domains.lp +++ b/groups-domains.lp @@ -86,7 +86,8 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')

Note:
The domain or regex filter will be automatically assigned to the Default Group.
- Other groups can optionally be assigned in the list below (using Group assignment). + Other groups can optionally be assigned in the list below (using Group assignment).
+ You can add multiple entries at once by separating them with spaces (e.g. example.com example.org).