diff --git a/server/docker-compose.yml b/server/docker-compose.yml index 7224ca2..f874378 100644 --- a/server/docker-compose.yml +++ b/server/docker-compose.yml @@ -16,9 +16,9 @@ services: - GITEA__database__NAME=gitea - GITEA__database__USER=gitea - GITEA__database__PASSWD=gitea_password - - GITEA__server__DOMAIN=a-crm.controlsystem.kz - - GITEA__server__ROOT_URL=https://a-crm.controlsystem.kz/git/ - - GITEA__server__SSH_DOMAIN=a-crm.controlsystem.kz + - GITEA__server__DOMAIN=git.a-crm.controlsystem.kz + - GITEA__server__ROOT_URL=http://git.a-crm.controlsystem.kz/ + - GITEA__server__SSH_DOMAIN=git.a-crm.controlsystem.kz - GITEA__server__SSH_PORT=2221 - GITEA__server__SSH_LISTEN_PORT=22 - GITEA__security__INSTALL_LOCK=true diff --git a/server/nginx/nginx.conf b/server/nginx/nginx.conf index 82bdf45..647c2d1 100644 --- a/server/nginx/nginx.conf +++ b/server/nginx/nginx.conf @@ -57,12 +57,14 @@ http { # Gitea proxy location /git/ { set $gitea_backend gitea:3000; - proxy_pass http://$gitea_backend; + proxy_pass http://$gitea_backend/; proxy_http_version 1.1; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Host $host; + proxy_set_header X-Forwarded-Prefix /git; } # Default - static files