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:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -17,8 +17,6 @@ build
|
|||||||
.idea
|
.idea
|
||||||
|
|
||||||
# Database
|
# Database
|
||||||
*.db
|
|
||||||
*.sqlite
|
|
||||||
|
|
||||||
# Logs
|
# Logs
|
||||||
*.log
|
*.log
|
||||||
|
|||||||
BIN
backend/sql_app.db
Normal file
BIN
backend/sql_app.db
Normal file
Binary file not shown.
@@ -1,9 +1,18 @@
|
|||||||
server {
|
server {
|
||||||
listen 80;
|
listen 80;
|
||||||
server_name localhost;
|
server_name itformhelp.ru www.itformhelp.ru;
|
||||||
|
return 301 https://$server_name$request_uri;
|
||||||
|
}
|
||||||
|
|
||||||
root /usr/share/nginx/html;
|
server {
|
||||||
index index.html;
|
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;
|
||||||
|
index index.html;
|
||||||
|
|
||||||
location / {
|
location / {
|
||||||
try_files $uri $uri/ /index.html;
|
try_files $uri $uri/ /index.html;
|
||||||
|
|||||||
Reference in New Issue
Block a user