From 8401b0ff97f105c6a01e3ad606321f21b278c479 Mon Sep 17 00:00:00 2001 From: Zaripov Emil Date: Thu, 23 Jan 2025 10:30:24 +0300 Subject: [PATCH 1/2] set version 1.9.8-SNAPSHOT --- backend/pom.xml | 2 +- distribution/pom.xml | 2 +- frontend/pom.xml | 2 +- pom.xml | 2 +- resources/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index 32ad730..fe56cdd 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu.lkrp fl - 1.9.7 + 1.9.8-SNAPSHOT ru.micord.ervu.lkrp.fl backend diff --git a/distribution/pom.xml b/distribution/pom.xml index c5b5f50..d36b01f 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu.lkrp fl - 1.9.7 + 1.9.8-SNAPSHOT ru.micord.ervu.lkrp.fl diff --git a/frontend/pom.xml b/frontend/pom.xml index 05c1add..ab6306a 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu.lkrp fl - 1.9.7 + 1.9.8-SNAPSHOT ru.micord.ervu.lkrp.fl diff --git a/pom.xml b/pom.xml index 9c0b94c..7b115dd 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 ru.micord.ervu.lkrp fl - 1.9.7 + 1.9.8-SNAPSHOT pom backend diff --git a/resources/pom.xml b/resources/pom.xml index c66782d..93285aa 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu.lkrp fl - 1.9.7 + 1.9.8-SNAPSHOT ru.micord.ervu.lkrp.fl From 1dfa9a8ac06d2e62b42d0a6c48e06e869e0b15d5 Mon Sep 17 00:00:00 2001 From: Pavel Zilke Date: Thu, 23 Jan 2025 12:16:28 +0300 Subject: [PATCH 2/2] DEVOPS-1898 --- config/nginx.conf | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/config/nginx.conf b/config/nginx.conf index 7ccb8ae..85b7e6a 100644 --- a/config/nginx.conf +++ b/config/nginx.conf @@ -57,8 +57,8 @@ http { gzip_min_length 256; gzip_types application/atom+xml - application/geo+json - application/javascript + application/geo+json + application/javascript application/x-javascript application/json application/ld+json @@ -81,39 +81,40 @@ http { index index.html; try_files $uri @index; - add_header Content-Security-Policy "frame-ancestors 'none'; default-src 'self'; script-src 'self'; style-src 'unsafe-inline' 'self' data:; font-src 'self' data:; img-src 'self' data:;"; + add_header Content-Security-Policy "frame-ancestors 'none'; default-src 'self'; script-src 'self'; style-src 'unsafe-inline' 'self' data:; font-src 'self' data:; img-src 'self' data:;"; - #Application config - location = /src/resources/app-config.json { + #Application config + location = /src/resources/app-config.json { add_header Cache-Control "no-cache"; expires 0; - } - # Media: images, icons, video, audio, HTC - location ~* \.(?:jpg|jpeg|gif|png|ico|cur|gz|svg|svgz|mp4|mp3|ogg|ogv|webm|htc|woff2|woff|ttf)$ { + } + # Media: images, icons, video, audio, HTC + location ~* \.(?:jpg|jpeg|gif|png|ico|cur|gz|svg|svgz|mp4|mp3|ogg|ogv|webm|htc|woff2|woff|ttf)$ { expires 1M; access_log off; # max-age must be in seconds add_header Cache-Control "max-age=2629746, public"; - } - # CSS and Javascript - location ~* \.(?:css|js)$ { + } + # CSS and Javascript + location ~* \.(?:css|js)$ { expires 1y; access_log off; add_header Cache-Control "max-age=31556952, public"; - } + } } - location @index { - root /frontend; + location @index { + root /frontend; add_header Cache-Control "no-cache"; + add_header Content-Security-Policy "frame-ancestors 'none'; default-src 'self'; script-src 'self'; style-src 'unsafe-inline' 'self' data:; font-src 'self' data:; img-src 'self' data:;"; expires 0; try_files /index.html =404; - } + } - location = /health { - access_log off; - add_header 'Content-Type' 'application/json'; - return 200 '{"status":"UP"}'; - } + location = /health { + access_log off; + add_header 'Content-Type' 'application/json'; + return 200 '{"status":"UP"}'; + } } }