rename ssl to tls/dep updates

Signed-off-by: Zoey <zoey@z0ey.de>
Update dependency sqlite3 to v5.1.6
Update dependency style-loader to v3.3.2
Update dependency @babel/core to v7.21.3
This commit is contained in:
Zoey
2023-03-13 22:35:08 +01:00
parent 7c32b466f6
commit bdae896baf
11 changed files with 13 additions and 12 deletions

View File

@@ -26,7 +26,7 @@
"objection": "2.2.18", "objection": "2.2.18",
"path": "0.12.7", "path": "0.12.7",
"signale": "1.4.0", "signale": "1.4.0",
"sqlite3": "5.1.5", "sqlite3": "5.1.6",
"temp-write": "4.0.0" "temp-write": "4.0.0"
}, },
"author": "Jamie Curnow <jc@jc21.com>", "author": "Jamie Curnow <jc@jc21.com>",

View File

@@ -1,6 +1,6 @@
{% if certificate and certificate_id > 0 -%} {% if certificate and certificate_id > 0 -%}
{% if ssl_forced == 1 or ssl_forced == true %} {% if ssl_forced == 1 or ssl_forced == true %}
# Force SSL # Force TLS
include conf.d/include/force-ssl.conf; include conf.d/include/force-tls.conf;
{% endif %}
{% endif %} {% endif %}
{% endif %}

View File

@@ -5,7 +5,7 @@ server {
{% include "_listen.conf" %} {% include "_listen.conf" %}
{% include "_certificates.conf" %} {% include "_certificates.conf" %}
{% include "_hsts.conf" %} {% include "_hsts.conf" %}
{% include "_forced_ssl.conf" %} {% include "_forced_tls.conf" %}
{% include "_brotli.conf" %} {% include "_brotli.conf" %}
{{ advanced_config }} {{ advanced_config }}

View File

@@ -14,7 +14,7 @@ server {
server_name _; server_name _;
include conf.d/include/brotli.conf; 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/tls-ciphers.conf;
include conf.d/include/acme-challenge.conf; include conf.d/include/acme-challenge.conf;
include conf.d/include/block-exploits.conf; include conf.d/include/block-exploits.conf;

View File

@@ -9,7 +9,7 @@ server {
{% include "_listen.conf" %} {% include "_listen.conf" %}
{% include "_certificates.conf" %} {% include "_certificates.conf" %}
{% include "_hsts.conf" %} {% include "_hsts.conf" %}
{% include "_forced_ssl.conf" %} {% include "_forced_tls.conf" %}
{% include "_brotli.conf" %} {% include "_brotli.conf" %}
include conf.d/include/acme-challenge.conf; include conf.d/include/acme-challenge.conf;

View File

@@ -5,7 +5,7 @@ server {
{% include "_listen.conf" %} {% include "_listen.conf" %}
{% include "_certificates.conf" %} {% include "_certificates.conf" %}
{% include "_hsts.conf" %} {% include "_hsts.conf" %}
{% include "_forced_ssl.conf" %} {% include "_forced_tls.conf" %}
{% include "_brotli.conf" %} {% include "_brotli.conf" %}
{{ advanced_config }} {{ advanced_config }}

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.21.0", "@babel/core": "7.21.3",
"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",
@@ -31,7 +31,7 @@
"nodemon": "2.0.21", "nodemon": "2.0.21",
"numeral": "2.0.6", "numeral": "2.0.6",
"sass-loader": "10.4.1", "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", "tabler-ui": "git+https://github.com/tabler/tabler.git#00f78ad823311bc3ad974ac3e5b0126198f0a813",
"underscore": "1.13.6", "underscore": "1.13.6",
"webpack": "4.46.0", "webpack": "4.46.0",

View File

@@ -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|/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/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/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 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

View File

@@ -18,7 +18,7 @@ server {
return 444; return 444;
include conf.d/include/brotli.conf; 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/tls-ciphers.conf;
include conf.d/include/block-exploits.conf; include conf.d/include/block-exploits.conf;
add_header alt-svc 'h3=":443"; ma=86400, h3-29=":443"; ma=86400'; add_header alt-svc 'h3=":443"; ma=86400, h3-29=":443"; ma=86400';

View File

@@ -9,7 +9,7 @@ server {
server_name _; server_name _;
include conf.d/include/brotli.conf; 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/tls-ciphers.conf;
include conf.d/include/block-exploits.conf; include conf.d/include/block-exploits.conf;