From bdae896baf2a368668f3e0d3456dc222f36b57ee Mon Sep 17 00:00:00 2001 From: Zoey Date: Mon, 13 Mar 2023 22:35:08 +0100 Subject: [PATCH] rename ssl to tls/dep updates Signed-off-by: Zoey Update dependency sqlite3 to v5.1.6 Update dependency style-loader to v3.3.2 Update dependency @babel/core to v7.21.3 --- backend/package.json | 2 +- backend/templates/{_forced_ssl.conf => _forced_tls.conf} | 6 +++--- backend/templates/dead_host.conf | 2 +- backend/templates/default.conf | 2 +- backend/templates/proxy_host.conf | 2 +- backend/templates/redirection_host.conf | 2 +- frontend/package.json | 4 ++-- rootfs/bin/start.sh | 1 + .../conf/conf.d/include/{force-ssl.conf => force-tls.conf} | 0 rootfs/usr/local/nginx/conf/conf.d/no-server-name.conf | 2 +- rootfs/usr/local/nginx/conf/conf.d/npm.conf | 2 +- 11 files changed, 13 insertions(+), 12 deletions(-) rename backend/templates/{_forced_ssl.conf => _forced_tls.conf} (59%) rename rootfs/usr/local/nginx/conf/conf.d/include/{force-ssl.conf => force-tls.conf} (100%) diff --git a/backend/package.json b/backend/package.json index bdfa2366..04e244fe 100644 --- a/backend/package.json +++ b/backend/package.json @@ -26,7 +26,7 @@ "objection": "2.2.18", "path": "0.12.7", "signale": "1.4.0", - "sqlite3": "5.1.5", + "sqlite3": "5.1.6", "temp-write": "4.0.0" }, "author": "Jamie Curnow ", diff --git a/backend/templates/_forced_ssl.conf b/backend/templates/_forced_tls.conf similarity index 59% rename from backend/templates/_forced_ssl.conf rename to backend/templates/_forced_tls.conf index 7fade20c..3b0226a2 100644 --- a/backend/templates/_forced_ssl.conf +++ b/backend/templates/_forced_tls.conf @@ -1,6 +1,6 @@ {% if certificate and certificate_id > 0 -%} {% if ssl_forced == 1 or ssl_forced == true %} - # Force SSL - include conf.d/include/force-ssl.conf; + # Force TLS + include conf.d/include/force-tls.conf; +{% endif %} {% endif %} -{% endif %} \ No newline at end of file diff --git a/backend/templates/dead_host.conf b/backend/templates/dead_host.conf index 8c620684..28bf68c5 100644 --- a/backend/templates/dead_host.conf +++ b/backend/templates/dead_host.conf @@ -5,7 +5,7 @@ server { {% include "_listen.conf" %} {% include "_certificates.conf" %} {% include "_hsts.conf" %} -{% include "_forced_ssl.conf" %} +{% include "_forced_tls.conf" %} {% include "_brotli.conf" %} {{ advanced_config }} diff --git a/backend/templates/default.conf b/backend/templates/default.conf index 5ea992fa..32263f63 100644 --- a/backend/templates/default.conf +++ b/backend/templates/default.conf @@ -14,7 +14,7 @@ server { server_name _; include conf.d/include/brotli.conf; - include conf.d/include/force-ssl.conf; + include conf.d/include/force-tls.conf; include conf.d/include/tls-ciphers.conf; include conf.d/include/acme-challenge.conf; include conf.d/include/block-exploits.conf; diff --git a/backend/templates/proxy_host.conf b/backend/templates/proxy_host.conf index 1f8f8628..fc09135d 100644 --- a/backend/templates/proxy_host.conf +++ b/backend/templates/proxy_host.conf @@ -9,7 +9,7 @@ server { {% include "_listen.conf" %} {% include "_certificates.conf" %} {% include "_hsts.conf" %} -{% include "_forced_ssl.conf" %} +{% include "_forced_tls.conf" %} {% include "_brotli.conf" %} include conf.d/include/acme-challenge.conf; diff --git a/backend/templates/redirection_host.conf b/backend/templates/redirection_host.conf index a5277c7d..924397ea 100644 --- a/backend/templates/redirection_host.conf +++ b/backend/templates/redirection_host.conf @@ -5,7 +5,7 @@ server { {% include "_listen.conf" %} {% include "_certificates.conf" %} {% include "_hsts.conf" %} -{% include "_forced_ssl.conf" %} +{% include "_forced_tls.conf" %} {% include "_brotli.conf" %} {{ advanced_config }} diff --git a/frontend/package.json b/frontend/package.json index be59d43e..3937a5bc 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -4,7 +4,7 @@ "description": "A beautiful interface for creating Nginx endpoints", "main": "js/index.js", "dependencies": { - "@babel/core": "7.21.0", + "@babel/core": "7.21.3", "babel-core": "6.26.3", "babel-loader": "8.3.0", "babel-preset-env": "1.7.0", @@ -31,7 +31,7 @@ "nodemon": "2.0.21", "numeral": "2.0.6", "sass-loader": "10.4.1", - "style-loader": "3.3.1", + "style-loader": "3.3.2", "tabler-ui": "git+https://github.com/tabler/tabler.git#00f78ad823311bc3ad974ac3e5b0126198f0a813", "underscore": "1.13.6", "webpack": "4.46.0", diff --git a/rootfs/bin/start.sh b/rootfs/bin/start.sh index 4019fcc2..8f8a6e7e 100755 --- a/rootfs/bin/start.sh +++ b/rootfs/bin/start.sh @@ -198,6 +198,7 @@ find /data/tls/certbot/renewal -type f -name '*.conf' -exec sed -i "s|/data/ssl| find /data/tls/certbot/renewal -type f -name '*.conf' -exec sed -i "s|/etc/letsencrypt|/data/tls/certbot|g" {} \; || sleep inf find /data/tls/certbot/renewal -type f -name '*.conf' -exec sed -i "s|/data/letsencrypt|/data/tls/certbot|g" {} \; || sleep inf +find /data/nginx -type f -name '*.conf' -exec sed -i "s|include conf.d/include/force-ssl.conf;|include conf.d/include/force-tls.conf;|g" {} \; || sleep inf find /data/nginx -type f -name '*.conf' -exec sed -i "s|include conf.d/include/ssl-ciphers.conf;|include conf.d/include/tls-ciphers.conf;|g" {} \; || sleep inf find /data/nginx -type f -name '*.conf' -exec sed -i "s|include conf.d/include/letsencrypt-acme-challenge.conf;|include conf.d/include/acme-challenge.conf;|g" {} \; || sleep inf diff --git a/rootfs/usr/local/nginx/conf/conf.d/include/force-ssl.conf b/rootfs/usr/local/nginx/conf/conf.d/include/force-tls.conf similarity index 100% rename from rootfs/usr/local/nginx/conf/conf.d/include/force-ssl.conf rename to rootfs/usr/local/nginx/conf/conf.d/include/force-tls.conf diff --git a/rootfs/usr/local/nginx/conf/conf.d/no-server-name.conf b/rootfs/usr/local/nginx/conf/conf.d/no-server-name.conf index 5d71c187..98337b93 100644 --- a/rootfs/usr/local/nginx/conf/conf.d/no-server-name.conf +++ b/rootfs/usr/local/nginx/conf/conf.d/no-server-name.conf @@ -18,7 +18,7 @@ server { return 444; include conf.d/include/brotli.conf; - include conf.d/include/force-ssl.conf; + include conf.d/include/force-tls.conf; include conf.d/include/tls-ciphers.conf; include conf.d/include/block-exploits.conf; add_header alt-svc 'h3=":443"; ma=86400, h3-29=":443"; ma=86400'; diff --git a/rootfs/usr/local/nginx/conf/conf.d/npm.conf b/rootfs/usr/local/nginx/conf/conf.d/npm.conf index 5b3c2054..5a2bb8dc 100644 --- a/rootfs/usr/local/nginx/conf/conf.d/npm.conf +++ b/rootfs/usr/local/nginx/conf/conf.d/npm.conf @@ -9,7 +9,7 @@ server { server_name _; include conf.d/include/brotli.conf; - include conf.d/include/force-ssl.conf; + include conf.d/include/force-tls.conf; include conf.d/include/tls-ciphers.conf; include conf.d/include/block-exploits.conf;