Merge branch 'develop' into hotfix/1.9.1

This commit is contained in:
Zaripov Emil 2024-12-18 17:06:18 +03:00
commit 80e77789af
3 changed files with 81 additions and 15 deletions

View file

@ -1,15 +1,9 @@
FROM nginx:stable-alpine
ARG LKRP_UL_URL="https:\/\/lkrp-dev.micord.ru\/ul\/"
ARG LKRP_UL_LANDING="https:\/\/lkrp-dev.micord.ru\/ul\/home.html"
ARG LKRP_FL_URL="https:\/\/lkrp-dev.micord.ru\/fl\/"
ARG LKRP_FL_LANDING="https:\/\/lkrp-dev.micord.ru\/fl\/home.html"
#COPY nginx.conf /etc/nginx/conf.d/default.conf
COPY config/nginx.conf.template /etc/nginx/templates/
COPY ./html/ /usr/share/nginx/html/
RUN cd /usr/share/nginx/html \
&& sed -i -r "s/LKRP_UL_URL/$LKRP_UL_URL/g" ./index.html \
&& sed -i -r "s/LKRP_UL_LANDING/$LKRP_UL_LANDING/g" ./index.html \
&& sed -i -r "s/LKRP_FL_URL/$LKRP_FL_URL/g" ./index.html \
&& sed -i -r "s/LKRP_FL_LANDING/$LKRP_FL_LANDING/g" ./index.html
ENV LKRP_UL_URL="https://lkrp-dev.micord.ru/ul/"
ENV LKRP_UL_LANDING="https://lkrp-dev.micord.ru/ul/home.html"
ENV LKRP_FL_URL="https://lkrp-dev.micord.ru/fl/"
ENV LKRP_FL_LANDING="https://lkrp-dev.micord.ru/fl/home.html"

View file

@ -0,0 +1,72 @@
log_format nginx_main
'$remote_addr - $remote_user [$time_local] $request '
'"$status" $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for" '
'"$request_filename" "$gzip_ratio" $upstream_response_time server: $host : $document_root $fastcgi_script_name ';
server {
listen 80 default;
access_log /var/log/nginx/access.log nginx_main;
error_log /var/log/nginx/error.log error;
sendfile off;
charset utf-8;
client_max_body_size 32m;
##
# `gzip` Settings
#
#
gzip on;
gzip_disable "msie6";
gzip_vary on;
gzip_proxied any;
gzip_comp_level 6;
gzip_buffers 16 8k;
gzip_http_version 1.1;
gzip_min_length 256;
gzip_types
application/atom+xml
application/geo+json
application/javascript
application/x-javascript
application/json
application/ld+json
application/manifest+json
application/rdf+xml
application/rss+xml
application/xhtml+xml
application/xml
font/eot
font/otf
font/ttf
image/svg+xml
text/css
text/javascript
text/plain
text/xml;
root /usr/share/nginx/html;
location / {
index index.html;
expires -1;
ssi on;
set $flUrl "${LKRP_FL_URL}";
set $flLandingUrl "${LKRP_FL_LANDING}";
set $ulUrl "${LKRP_UL_URL}";
set $ulLandingUrl "${LKRP_UL_LANDING}";
try_files $uri $uri/ $uri/index.html;
}
location = /health {
access_log off;
add_header 'Content-Type' 'application/json';
return 200 '{"status":"UP"}';
}
}

View file

@ -28,14 +28,14 @@
<div class="block block-fl">
<div class="block-img"></div>
<div class="block-title">Для граждан</div>
<div class="block-description">Проверить повестки на Ваше имя и получить выписку из Реестра можно в <a href="LKRP_FL_URL">Личном кабинете</a></div>
<a href="LKRP_FL_LANDING" class="btn">Подробнее</a>
<div class="block-description">Проверить повестки на Ваше имя и получить выписку из Реестра можно в <a href="<!--#echo var="flUrl"-->">Личном кабинете</a></div>
<a href="<!--#echo var="flLandingUrl"-->" class="btn">Подробнее</a>
</div>
<div class="block block-ul">
<div class="block-img"></div>
<div class="block-title">Для организаций</div>
<div class="block-description">Направление сведений через <a href="LKRP_UL_URL">Личный кабинет</a><br /><br /></div>
<a href="LKRP_UL_LANDING" class="btn">Подробнее</a>
<div class="block-description">Направление сведений через <a href="<!--#echo var="ulUrl"-->">Личный кабинет</a><br /><br /></div>
<a href="<!--#echo var="ulLandingUrl"-->" class="btn">Подробнее</a>
</div>
</div>
</div>