diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eac0fa0..25e6d90 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,10 +63,11 @@ deploy: - echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa - chmod 600 ~/.ssh/id_rsa - ssh-keyscan -H "$SSH_HOST" > /dev/null 2>&1 + - AUTH_COMMAND="echo "$CI_REGISTRY_PASSWORD" | docker login $CI_REGISTRY --username $CI_REGISTRY_USER --password-stdin"; - ssh $SSH_ADDRESS "$AUTH_COMMAND" - - ssh $SSH_ADDRESS "echo $PATH > path.log" - scp -C -r infrastructure/ ssl/ compose.yaml $SSH_ADDRESS:~/deploy/ + - ssh $SSH_ADDRESS "cd ~/deploy && \ docker compose pull > deploy.log 2>&1 && \ docker compose down >> deploy.log 2>&1 && \ diff --git a/infrastructure/nginx/nginx.conf b/infrastructure/nginx/nginx.conf index 08545c6..fc975a6 100644 --- a/infrastructure/nginx/nginx.conf +++ b/infrastructure/nginx/nginx.conf @@ -55,7 +55,6 @@ http { access_log /var/log/nginx/access.log main; server_tokens off; - more_clear_headers 'Server'; server { listen 80 default_server;