Fabio/nginx-proxy-manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

dep updates/use lts node/close https://github.com/ZoeyVid/NPMplus/discussions/800

Browse source 
Signed-off-by: Zoey <zoey@z0ey.de>
This commit is contained in:
renovate[bot] 2024-04-28 11:21:38 +00:00 committed by Zoey
parent 5e9619beef
commit e0986c2bec
No known key found for this signature in database
GPG key ID: 02A3919EB4F67328
5 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Dockerfile
View file

@ -24,12 +24,12 @@ ARG NODE_ENV=production \
TARGETARCH TARGETARCH
WORKDIR /build/backend WORKDIR /build/backend
RUN apk upgrade --no-cache -a && \ RUN apk upgrade --no-cache -a && \
apk add --no-cache ca-certificates nodejs-current yarn && \ apk add --no-cache ca-certificates nodejs yarn && \
yarn global add clean-modules && \ yarn global add clean-modules && \
if [ "$TARGETARCH" = "amd64" ]; then \ if [ "$TARGETARCH" = "amd64" ]; then \
npm_config_target_platform=linux npm_config_target_arch=x64 yarn install --no-lockfile; \ npm_config_target_platform=linux npm_config_target_arch=x64 yarn install --no-lockfile; \
elif [ "$TARGETARCH" = "arm64" ]; then \ elif [ "$TARGETARCH" = "arm64" ]; then \
npm_config_target_platform=linux npm_config_target_arch=arm64 yarn install --no-lockfile; \ npm_config_target_platform=linux npm_config_target_arch=arm64 yarn install --no-lockfile; \
fi && \ fi && \
clean-modules --yes && \ clean-modules --yes && \
yarn cache clean --all yarn cache clean --all
@ -58,7 +58,7 @@ RUN apk upgrade --no-cache -a && \
echo "APPSEC_FAILURE_ACTION=deny" | tee -a /src/crowdsec-nginx-bouncer/lua-mod/config_example.conf && \ echo "APPSEC_FAILURE_ACTION=deny" | tee -a /src/crowdsec-nginx-bouncer/lua-mod/config_example.conf && \
sed -i "s|BOUNCING_ON_TYPE=all|BOUNCING_ON_TYPE=ban|g" /src/crowdsec-nginx-bouncer/lua-mod/config_example.conf sed -i "s|BOUNCING_ON_TYPE=all|BOUNCING_ON_TYPE=ban|g" /src/crowdsec-nginx-bouncer/lua-mod/config_example.conf
FROM zoeyvid/nginx-quic:python-275 FROM zoeyvid/nginx-quic:281-python
SHELL ["/bin/ash", "-eo", "pipefail", "-c"] SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
ARG CRS_VER=v4.2.0 ARG CRS_VER=v4.2.0
@ -69,8 +69,8 @@ COPY --from=zoeyvid/curl-quic:380 /usr/local/bin/curl /usr/local/bin/curl
RUN apk upgrade --no-cache -a && \ RUN apk upgrade --no-cache -a && \
apk add --no-cache ca-certificates tzdata tini \ apk add --no-cache ca-certificates tzdata tini \
nodejs \
bash nano \ bash nano \
nodejs-current \
openssl apache2-utils \ openssl apache2-utils \
lua5.1-lzlib lua5.1-socket \ lua5.1-lzlib lua5.1-socket \
coreutils grep findutils jq shadow su-exec \ coreutils grep findutils jq shadow su-exec \

8
backend/internal/host.js
View file

@ -6,8 +6,7 @@ const deadHostModel = require('../models/dead_host');
const internalHost = { const internalHost = {
/** /**
* Makes sure that the ssl_* and hsts_* fields play nicely together. * Makes sure that the ssl_* and hsts_* fields play nicely together.
* ie: if there is no cert, then force_ssl is off. * ie: if force_ssl is off, then hsts_enabled is definitely off.
* if force_ssl is off, then hsts_enabled is definitely off.
* *
* @param {object} data * @param {object} data
* @param {object} [existing_data] * @param {object} [existing_data]
@ -18,11 +17,6 @@ const internalHost = {
const combined_data = _.assign({}, existing_data, data); const combined_data = _.assign({}, existing_data, data);
if (!combined_data.certificate_id) {
combined_data.ssl_forced = false;
combined_data.hsts_subdomains = false;
}
if (!combined_data.ssl_forced) { if (!combined_data.ssl_forced) {
combined_data.hsts_enabled = false; combined_data.hsts_enabled = false;
} }

2
backend/models/redirection_host.js
View file

@ -23,8 +23,6 @@ class RedirectionHost extends Model {
if (typeof this.meta === 'undefined') { if (typeof this.meta === 'undefined') {
this.meta = {}; this.meta = {};
} }
this.domain_names.sort();
} }
$beforeUpdate() { $beforeUpdate() {

4
backend/package.json
View file

@ -16,7 +16,7 @@
"gravatar": "1.8.2", "gravatar": "1.8.2",
"jsonwebtoken": "9.0.2", "jsonwebtoken": "9.0.2",
"knex": "3.1.0", "knex": "3.1.0",
"liquidjs": "10.11.1", "liquidjs": "10.12.0",
"lodash": "4.17.21", "lodash": "4.17.21",
"moment": "2.30.1", "moment": "2.30.1",
"mysql": "2.18.1", "mysql": "2.18.1",
@ -33,7 +33,7 @@
"eslint": "9.1.1", "eslint": "9.1.1",
"eslint-config-prettier": "9.1.0", "eslint-config-prettier": "9.1.0",
"eslint-plugin-prettier": "5.1.3", "eslint-plugin-prettier": "5.1.3",
"globals": "15.0.0", "globals": "15.1.0",
"prettier": "3.2.5" "prettier": "3.2.5"
} }
} }

2
frontend/package.json
View file

@ -4,7 +4,7 @@
"description": "A beautiful interface for creating Nginx endpoints", "description": "A beautiful interface for creating Nginx endpoints",
"main": "js/index.js", "main": "js/index.js",
"dependencies": { "dependencies": {
"@babel/core": "7.24.4", "@babel/core": "7.24.5",
"babel-core": "6.26.3", "babel-core": "6.26.3",
"babel-loader": "8.3.0", "babel-loader": "8.3.0",
"babel-preset-env": "1.7.0", "babel-preset-env": "1.7.0",