From 3371b194f9d91f7cea48ff566940db6ac210b4e5 Mon Sep 17 00:00:00 2001
From: mt77 <kirill@muffin77.ru>
Date: Thu, 15 May 2025 00:01:25 +0500
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D1=82?=
 =?UTF-8?q?=D1=8C=20.gitea/workflows/deploy.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/deploy.yml | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 9457836..d0f7d5d 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -20,26 +20,21 @@ jobs:
           username: ${{ secrets.SSH_USER }}
           key: ${{ secrets.SSH_PRIVATE_KEY }}
           script: |
-            echo "vars: $GIT_INSTANCE and ${{ vars.GIT_INSTANCE }}" >> /tmp/test.log
+            echo "vars: ${{ vars.GIT_INSTANCE }}" >> /tmp/test.log
             echo "secrets: $BOT_CHATID and ${{secrets.BOT_CHATID}}" >> /tmp/test.log
-            sudo docker login -u $GIT_USERNAME -p $GIT_TOKEN $GIT_INSTANCE
-            sudo docker pull $GIT_INSTANCE/mt77/monitor:latest
+            sudo docker login -u ${{ secrets.GIT_USERNAME }} -p ${{ secrets.GIT_TOKEN }} ${{ vars.GIT_INSTANCE }}
+            sudo docker pull ${{ vars.GIT_INSTANCE }}/mt77/monitor:latest
             sudo docker stop monitor || true
             sudo docker rm monitor || true
             sudo docker run -d --name monitor \
-              -e BOT_TOKEN="$BOT_TOKEN" \
-              -e BOT_CHATID=$BOT_CHATID \
+              -e BOT_TOKEN="${{ secrets.BOT_TOKEN }}" \
+              -e BOT_CHATID=${{ secrets.BOT_CHATID }} \
               -e TARGET_DOMAINS="$TARGET_DOMAINS"  \
               -e TARGET_PROTOCOL="$TARGET_PROTOCOL" \
               -e TARGET_SSL_VERIFY=$TARGET_SSL_VERIFY \
-              $GIT_INSTANCE/mt77/monitor:latest
-            sudo docker logout $GIT_INSTANCE
+              ${{ vars.GIT_INSTANCE }}/mt77/monitor:latest
+            sudo docker logout ${{ vars.GIT_INSTANCE }}
         envs:
-          GIT_INSTANCE: ${{ vars.GIT_INSTANCE }}
-          GIT_USERNAME: ${{ secrets.GIT_USERNAME }}
-          GIT_TOKEN: ${{ secrets.GIT_USERNAME }}
           TARGET_DOMAINS: "muffin77.ru,git.muffin77.ru,cloud.muffin77.ru,mail.muffin77.ru,dev.muffin77.ru,google.com"
           TARGET_PROTOCOL: "https"
-          TARGET_SSL_VERIFY: true
-          BOT_TOKEN: ${{ secrets.BOT_TOKEN }}
-          BOT_CHATID: ${{ secrets.BOT_CHATID }}
\ No newline at end of file
+          TARGET_SSL_VERIFY: true
\ No newline at end of file