micord/ervu-lkrp-fl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into develop

Browse source 
# Conflicts:
#	backend/pom.xml
#	backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
#	distribution/pom.xml
#	frontend/pom.xml
#	pom.xml
#	resources/pom.xml
This commit is contained in:
Eduard Tihomirov 2025-02-03 14:05:34 +03:00
commit 39a1f753e3
36 changed files with 1062 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

4
config/nginx.conf
View file

@ -81,7 +81,7 @@ 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'; connect-src 'self' https://www.sberbank.ru; 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 {
@ -106,7 +106,7 @@ http {
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:;";
add_header Content-Security-Policy "frame-ancestors 'none'; default-src 'self'; connect-src 'self' https://www.sberbank.ru; script-src 'self'; style-src 'unsafe-inline' 'self' data:; font-src 'self' data:; img-src 'self' data:;";
expires 0;
try_files /index.html =404;
}

4
config/tomcat/etc/tomcat/server.xml
View file

@ -162,8 +162,8 @@
Documentation at: /docs/config/valve.html
Note: The pattern used is equivalent to using pattern="common" -->
<Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
prefix="localhost_access_log" suffix=".txt"
pattern="%h %l %u %t &quot;%r&quot; %s %b" />
prefix="localhost_access_log" suffix=".log"
pattern="%h %l %u %t &quot;%r&quot; %s %b %D" />
</Host>
</Engine>