.gitea/workflows/deploy.yaml

@@ -26,10 +26,6 @@ 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
           "

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
 

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=9MQVuajOz3ayFbpe4EKYIPSWeFBNOYbEuNwa2xUb
+      - GITEA_RUNNER_REGISTRATION_TOKEN=WRXwMh6gi6CrF3XddpkH4mcrx8sNpnyBam0FY9gj