diff --git a/.gitignore b/.gitignore index 59247f6..3d2d60e 100644 --- a/.gitignore +++ b/.gitignore @@ -27,4 +27,7 @@ backup.json app/webapp/override/ .rest -subscription.php \ No newline at end of file +subscription.php +location.conf +override.conf +i18n.override.php \ No newline at end of file diff --git a/app/i18n.php b/app/i18n.php index 160466b..d541016 100644 --- a/app/i18n.php +++ b/app/i18n.php @@ -378,3 +378,7 @@ $i = [ 'ru' => 'перезагрузка', ], ]; + +if (file_exists(__DIR__ . '/i18n.override.php')) { + include __DIR__ . '/i18n.override.php'; +} diff --git a/config/nginx.conf b/config/nginx.conf index c39d1c4..54270dc 100644 --- a/config/nginx.conf +++ b/config/nginx.conf @@ -11,7 +11,7 @@ events { http { server_names_hash_bucket_size 64; server_tokens off; - include include.conf; + include override.conf; include /etc/nginx/mime.types; default_type application/octet-stream; @@ -122,6 +122,7 @@ http { proxy_cache_key $scheme$proxy_host$uri$is_args$args$request_body; proxy_pass https://ad/dns-query; } + include location.conf; } #~ @@ -210,6 +211,8 @@ http { # proxy_cache_key $scheme$proxy_host$uri$is_args$args$request_body; # proxy_pass https://ad/dns-query; # } + + # include location.conf; # } #-domain } diff --git a/config/nginx_default.conf b/config/nginx_default.conf index c39d1c4..54270dc 100644 --- a/config/nginx_default.conf +++ b/config/nginx_default.conf @@ -11,7 +11,7 @@ events { http { server_names_hash_bucket_size 64; server_tokens off; - include include.conf; + include override.conf; include /etc/nginx/mime.types; default_type application/octet-stream; @@ -122,6 +122,7 @@ http { proxy_cache_key $scheme$proxy_host$uri$is_args$args$request_body; proxy_pass https://ad/dns-query; } + include location.conf; } #~ @@ -210,6 +211,8 @@ http { # proxy_cache_key $scheme$proxy_host$uri$is_args$args$request_body; # proxy_pass https://ad/dns-query; # } + + # include location.conf; # } #-domain } diff --git a/docker-compose.yml b/docker-compose.yml index d7be708..344c9b6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -75,7 +75,8 @@ services: volumes: - ./config/.profile:/root/.ashrc:ro - ./config/nginx.conf:/etc/nginx/nginx.conf - - ./config/include.conf:/etc/nginx/include.conf + - ./config/override.conf:/etc/nginx/override.conf + - ./config/location.conf:/etc/nginx/location.conf - ./config/nginx_default.conf:/nginx_default.conf - ./scripts/start_ng.sh:/start_ng.sh - ./certs/:/certs/ diff --git a/makefile b/makefile index 25ecf7e..74c7ae7 100644 --- a/makefile +++ b/makefile @@ -3,7 +3,7 @@ b: u: # запуск контейнеров $(eval IP := $(shell hostname -I | awk '{print $$1}')) bash ./update/update.sh & - touch ./override.env ./docker-compose.override.yml + touch ./override.env ./docker-compose.override.yml ./config/location.conf ./config/override.conf IP=$(IP) VER=$(shell git describe --tags) docker compose --env-file ./.env --env-file ./override.env up -d --force-recreate d: # остановка контейнеров -kill -9 $(shell cat ./update/update_pid) > /dev/null diff --git a/version b/version index 83640b2..85fbb8b 100644 --- a/version +++ b/version @@ -1,4 +1,10 @@ -16.07.2025 v2.23 +19.07.2025 v2.25 +- перед запуском обязательно запустить: +
touch ./override.env ./docker-compose.override.yml ./config/location.conf ./config/override.conf+- для nginx вместо include.conf теперь override.conf, не затирается +- location.conf (by legiz), не затирается +- app/i18n.override.php для собственных названий кнопок, не затирается +16.07.2025 v2.24 - фикс зависания бота из-за пустого статуса warp - скрипт socat.sh для мостов /mirror 04.07.2025 v2.23