diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 994daee..e53064d 100755 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -26,6 +26,10 @@ jobs: cd ${{ secrets.PROJECT_PATH }} && git pull origin main && docker-compose down --remove-orphans && +<<<<<<< HEAD sleep 3 && +======= + sleep 3 && +>>>>>>> ebdc08a921273e8a46bcf5fcf9a727dc832aa7d3 docker-compose up -d --build " diff --git a/docker-compose.yaml b/docker-compose.yaml index 05749e0..fa4aacb 100755 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -9,7 +9,7 @@ services: - /home/apotheosis/projectWeb:/usr/share/nginx/html - /home/domain.crt:/etc/nginx/conf.d/domain.crt - /home/domain.key:/etc/nginx/conf.d/domain.key - - /home//domain.conf:/etc/nginx/conf.d/default.conf + - /home/domain.conf:/etc/nginx/conf.d/default.conf - /etc/letsencrypt/live/super-admins.online/privkey.pem:/etc/nginx/conf.d/privkey.pem - /etc/letsencrypt/live/super-admins.online/fullchain.pem:/etc/nginx/conf.d/fullchain.pem diff --git a/gitea-runner/docker-compose.yaml b/gitea-runner/docker-compose.yaml index 03c208e..d9b357b 100755 --- a/gitea-runner/docker-compose.yaml +++ b/gitea-runner/docker-compose.yaml @@ -11,4 +11,4 @@ services: - /var/gitea-runner:/data environment: - GITEA_INSTANCE_URL=https://super-admins.online - - GITEA_RUNNER_REGISTRATION_TOKEN=WRXwMh6gi6CrF3XddpkH4mcrx8sNpnyBam0FY9gj + - GITEA_RUNNER_REGISTRATION_TOKEN=9MQVuajOz3ayFbpe4EKYIPSWeFBNOYbEuNwa2xUb