Skip to content

Commit 40afef5

Browse files
thespadthespad
authored
Merge pull request #15 from linuxserver/allow-allow
2 parents 24b1717 + 1c97658 commit 40afef5

File tree

6 files changed

+16
-15
lines changed

6 files changed

+16
-15
lines changed

‎Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ pipeline {
3636
CI_PORT='2375'
3737
CI_SSL='false'
3838
CI_DELAY='120'
39-
CI_DOCKERENV='TZ=Europe/London'
39+
CI_DOCKERENV=''
4040
CI_AUTH=''
4141
CI_WEBPATH=''
4242
}

‎README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,9 @@ Containers are configured using parameters passed at runtime (such as those abov
158158

159159
| Parameter | Function |
160160
| :----: | --- |
161-
| `-e ALLOW_START=0` | `/containers/{id}/start` |
162-
| `-e ALLOW_STOP=0` | `/containers/{id}/stop` |
163-
| `-e ALLOW_RESTARTS=0` | `/containers/{id}/stop`, `/containers/{id}/restart`, and `/containers/{id}/kill` |
161+
| `-e ALLOW_START=0` | `/containers/{id}/start` - **This option will work even if `POST=0`** |
162+
| `-e ALLOW_STOP=0` | `/containers/{id}/stop` - **This option will work even if `POST=0`** |
163+
| `-e ALLOW_RESTARTS=0` | `/containers/{id}/stop`, `/containers/{id}/restart`, and `/containers/{id}/kill` - **This option will work even if `POST=0`** |
164164
| `-e AUTH=0` | `/auth` |
165165
| `-e BUILD=0` | `/build` |
166166
| `-e COMMIT=0` | `/commit` |
@@ -308,6 +308,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
308308

309309
## Versions
310310

311+
* **26.08.24:** - Change `ALLOW_START`, `ALLOW_STOP`, and `ALLOW_RESTARTS` to work even with `POST=0`.
311312
* **24.05.24:** - Rebase to Alpine 3.20.
312313
* **15.04.24:** - Allow disabling IPv6 support for legacy devices.
313314
* **08.04.24:** - Use nginx due to haproxy's wonky websockets handling.

‎jenkins-vars.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ external_type: alpine_repo
66
release_type: stable
77
release_tag: latest
88
ls_branch: main
9-
build_armhf: false
109
repo_vars:
1110
- BUILD_VERSION_ARG = 'NGINX_VERSION'
1211
- LS_USER = 'linuxserver'
@@ -25,6 +24,6 @@ repo_vars:
2524
- CI_PORT='2375'
2625
- CI_SSL='false'
2726
- CI_DELAY='120'
28-
- CI_DOCKERENV='TZ=Europe/London'
27+
- CI_DOCKERENV=''
2928
- CI_AUTH=''
3029
- CI_WEBPATH=''

‎readme-vars.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,9 @@ full_custom_readme: |
162162
163163
| Parameter | Function |
164164
| :----: | --- |
165-
| `-e ALLOW_START=0` | `/containers/{id}/start` |
166-
| `-e ALLOW_STOP=0` | `/containers/{id}/stop` |
167-
| `-e ALLOW_RESTARTS=0` | `/containers/{id}/stop`, `/containers/{id}/restart`, and `/containers/{id}/kill` |
165+
| `-e ALLOW_START=0` | `/containers/{id}/start` - **This option will work even if `POST=0`** |
166+
| `-e ALLOW_STOP=0` | `/containers/{id}/stop` - **This option will work even if `POST=0`** |
167+
| `-e ALLOW_RESTARTS=0` | `/containers/{id}/stop`, `/containers/{id}/restart`, and `/containers/{id}/kill` - **This option will work even if `POST=0`** |
168168
| `-e AUTH=0` | `/auth` |
169169
| `-e BUILD=0` | `/build` |
170170
| `-e COMMIT=0` | `/commit` |
@@ -312,6 +312,7 @@ full_custom_readme: |
312312
313313
## Versions
314314
315+
* **26.08.24:** - Change `ALLOW_START`, `ALLOW_STOP`, and `ALLOW_RESTARTS` to work even with `POST=0`.
315316
* **24.05.24:** - Rebase to Alpine 3.20.
316317
* **15.04.24:** - Allow disabling IPv6 support for legacy devices.
317318
* **08.04.24:** - Use nginx due to haproxy's wonky websockets handling.

‎root/templates/default_nopost.template

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ server {
3333

3434
include /etc/nginx/proxy.conf;
3535

36-
location ~* ^(/v[\d\.]+)?/containers/[a-zA-Z0-9_.-]+/((stop)|(restart)|(kill)) {limit_except GET HEAD {deny all;}if ($path_restarts = 0){return 403;}proxy_pass http://unix:$dockersocket;}
37-
location ~* ^(/v[\d\.]+)?/containers/[a-zA-Z0-9_.-]+/start {limit_except GET HEAD {deny all;}if ($path_start = 0){return 403;}proxy_pass http://unix:$dockersocket;}
38-
location ~* ^(/v[\d\.]+)?/containers/[a-zA-Z0-9_.-]+/stop {limit_except GET HEAD {deny all;}if ($path_stop = 0){return 403;}proxy_pass http://unix:$dockersocket;}
36+
location ~* ^(/v[\d\.]+)?/containers/[a-zA-Z0-9_.-]+/((stop)|(restart)|(kill)) {if ($path_restarts = 0){return 403;}proxy_pass http://unix:$dockersocket;}
37+
location ~* ^(/v[\d\.]+)?/containers/[a-zA-Z0-9_.-]+/start {if ($path_start = 0){return 403;}proxy_pass http://unix:$dockersocket;}
38+
location ~* ^(/v[\d\.]+)?/containers/[a-zA-Z0-9_.-]+/stop {if ($path_stop = 0){return 403;}proxy_pass http://unix:$dockersocket;}
3939
location ~* ^(/v[\d\.]+)?/auth {limit_except GET HEAD {deny all;}if ($path_auth = 0){return 403;}proxy_pass http://unix:$dockersocket;}
4040
location ~* ^(/v[\d\.]+)?/build {limit_except GET HEAD {deny all;}if ($path_build = 0){return 403;}proxy_pass http://unix:$dockersocket;}
4141
location ~* ^(/v[\d\.]+)?/commit {limit_except GET HEAD {deny all;}if ($path_commit = 0){return 403;}proxy_pass http://unix:$dockersocket;}

‎root/templates/default_nopost_ipv4.template

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ server {
3232

3333
include /etc/nginx/proxy.conf;
3434

35-
location ~* ^(/v[\d\.]+)?/containers/[a-zA-Z0-9_.-]+/((stop)|(restart)|(kill)) {limit_except GET HEAD {deny all;}if ($path_restarts = 0){return 403;}proxy_pass http://unix:$dockersocket;}
36-
location ~* ^(/v[\d\.]+)?/containers/[a-zA-Z0-9_.-]+/start {limit_except GET HEAD {deny all;}if ($path_start = 0){return 403;}proxy_pass http://unix:$dockersocket;}
37-
location ~* ^(/v[\d\.]+)?/containers/[a-zA-Z0-9_.-]+/stop {limit_except GET HEAD {deny all;}if ($path_stop = 0){return 403;}proxy_pass http://unix:$dockersocket;}
35+
location ~* ^(/v[\d\.]+)?/containers/[a-zA-Z0-9_.-]+/((stop)|(restart)|(kill)) {if ($path_restarts = 0){return 403;}proxy_pass http://unix:$dockersocket;}
36+
location ~* ^(/v[\d\.]+)?/containers/[a-zA-Z0-9_.-]+/start {if ($path_start = 0){return 403;}proxy_pass http://unix:$dockersocket;}
37+
location ~* ^(/v[\d\.]+)?/containers/[a-zA-Z0-9_.-]+/stop {if ($path_stop = 0){return 403;}proxy_pass http://unix:$dockersocket;}
3838
location ~* ^(/v[\d\.]+)?/auth {limit_except GET HEAD {deny all;}if ($path_auth = 0){return 403;}proxy_pass http://unix:$dockersocket;}
3939
location ~* ^(/v[\d\.]+)?/build {limit_except GET HEAD {deny all;}if ($path_build = 0){return 403;}proxy_pass http://unix:$dockersocket;}
4040
location ~* ^(/v[\d\.]+)?/commit {limit_except GET HEAD {deny all;}if ($path_commit = 0){return 403;}proxy_pass http://unix:$dockersocket;}

0 commit comments

Comments
 (0)