1
0
mirror of https://gitlab.com/MoonTestUse1/AdministrationItDepartmens.git synced 2025-08-14 00:25:46 +02:00

Merge remote changes and resolve conflicts

This commit is contained in:
MoonTestUse1
2024-12-25 02:10:01 +06:00
parent 1f58da3677
commit b45281ce93
3 changed files with 13 additions and 6 deletions

2
.gitignore vendored
View File

@@ -17,8 +17,6 @@ build
.idea .idea
# Database # Database
*.db
*.sqlite
# Logs # Logs
*.log *.log

BIN
backend/sql_app.db Normal file

Binary file not shown.

View File

@@ -1,6 +1,15 @@
server { server {
listen 80; listen 80;
server_name localhost; server_name itformhelp.ru www.itformhelp.ru;
return 301 https://$server_name$request_uri;
}
server {
listen 443 ssl;
server_name itformhelp.ru www.itformhelp.ru;
ssl_certificate /etc/letsencrypt/live/itformhelp.ru/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/itformhelp.ru/privkey.pem;
root /usr/share/nginx/html; root /usr/share/nginx/html;
index index.html; index index.html;