Skip to content

Commit 68768e2

Browse files
renovate[bot]Zoey2936
authored andcommitted
close #853 by fixing openssl regex/dep updates
1 parent 3eaf932 commit 68768e2

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

Caddy.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM caddy:2.7.6 as caddy
1+
FROM caddy:2.8.1 as caddy
22

33
FROM alpine:3.20.0
44
RUN apk add --no-cache ca-certificates tzdata

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ RUN apk upgrade --no-cache -a && \
6262
FROM zoeyvid/nginx-quic:287-python
6363
SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
6464

65-
ARG CRS_VER=v4.2.0
65+
ARG CRS_VER=v4.3.0
6666

6767
COPY rootfs /
6868
COPY --from=zoeyvid/certbot-docker:35 /usr/local /usr/local

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ Immediately after logging in with this default user you will be asked to modify
205205
### prerun scripts (EXPERT option) - if you don't know what this is, ignore it
206206
run order: entrypoint.sh (prerun scripts) => start.sh => launch.sh <br>
207207
if you need to run scripts before NPMplus launches put them under: `/opt/npm/etc/prerun/*.sh` (please add `#!/bin/sh` / `#!/bin/bash` to the top of the script) <br>
208-
you need to create this folder yourself - **NOTE:** I won't help you creating thoose patches/scripts if you need them you also need to know how to create them
208+
you need to create this folder yourself - **NOTE:** I won't help you creating those patches/scripts if you need them you also need to know how to create them
209209

210210
## Contributing
211211
All are welcome to create pull requests for this project, against the `develop` branch.

backend/internal/certificate.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@ const internalCertificate = {
681681
.exec('openssl x509 -in ' + certificate_file + ' -subject -noout')
682682
.then((result) => {
683683
// subject=CN = something.example.com
684-
const regex = /(?:subject=)?[^=]+=\s+(\S+)/gim;
684+
const regex = /(?:subject=)?[^=]+=\s*(\S+)/gim;
685685
const match = regex.exec(result);
686686

687687
if (typeof match[1] === 'undefined') {

backend/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"gravatar": "1.8.2",
1717
"jsonwebtoken": "9.0.2",
1818
"knex": "3.1.0",
19-
"liquidjs": "10.13.0",
19+
"liquidjs": "10.13.1",
2020
"lodash": "4.17.21",
2121
"moment": "2.30.1",
2222
"mysql": "2.18.1",
@@ -29,8 +29,8 @@
2929
"author": "Jamie Curnow <[email protected]> and ZoeyVid <[email protected]>",
3030
"license": "MIT",
3131
"devDependencies": {
32-
"@eslint/js": "9.3.0",
33-
"eslint": "9.3.0",
32+
"@eslint/js": "9.4.0",
33+
"eslint": "9.4.0",
3434
"eslint-config-prettier": "9.1.0",
3535
"eslint-plugin-prettier": "5.1.3",
3636
"globals": "15.3.0",

frontend/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "A beautiful interface for creating Nginx endpoints",
55
"main": "js/index.js",
66
"dependencies": {
7-
"@babel/core": "7.24.5",
7+
"@babel/core": "7.24.6",
88
"babel-core": "6.26.3",
99
"babel-loader": "8.3.0",
1010
"babel-preset-env": "1.7.0",
@@ -28,7 +28,7 @@
2828
"mini-css-extract-plugin": "1.6.2",
2929
"moment": "2.30.1",
3030
"node-sass": "7.0.3",
31-
"nodemon": "3.1.0",
31+
"nodemon": "3.1.2",
3232
"numeral": "2.0.6",
3333
"sass-loader": "10.5.2",
3434
"style-loader": "4.0.0",

rootfs/usr/local/nginx/conf/nginx.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ http {
5757

5858
resolver local=on valid=10s ipv6=on;
5959
fastcgi_index index.php;
60-
index index.php index.html;
60+
index index.html index.php;
6161

6262
error_page 404 =307 $scheme://$host:$server_port;
6363
error_page 497 =301 https://$host:$server_port$request_uri;

0 commit comments

Comments
 (0)