From f469ed2d5e7332ba2d2daef1188b2f90d775052e Mon Sep 17 00:00:00 2001 From: MrWhiff Date: Thu, 26 Feb 2026 23:16:15 +0000 Subject: [PATCH 1/7] =?UTF-8?q?Auto=20Deploy=20Hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .forgejo/workflows/deploy.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .forgejo/workflows/deploy.yml diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yml new file mode 100644 index 0000000..ca5c67c --- /dev/null +++ b/.forgejo/workflows/deploy.yml @@ -0,0 +1,24 @@ +name: Deploy AstraOS Panel + +on: + push: + branches: ["main"] + +jobs: + deploy: + runs-on: docker + + steps: + - name: Checkout repo + uses: actions/checkout@v4 + + - name: Deploy AstraOS folder + uses: appleboy/scp-action@v0.1.7 + with: + host: 127.0.0.1 + username: astraos + key: ${{ secrets.DEPLOY_KEY }} + port: 22 + source: "AstraOS/*" + target: "/home/astraos/Astra-OS-Panel" + overwrite: true \ No newline at end of file From a68cfaa0d7bb76c07c19d9203bda676b6db2e997 Mon Sep 17 00:00:00 2001 From: MrWhiff Date: Thu, 26 Feb 2026 23:22:59 +0000 Subject: [PATCH 2/7] Auto Deploy Fixed --- .forgejo/workflows/deploy.yml | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yml index ca5c67c..88e0a79 100644 --- a/.forgejo/workflows/deploy.yml +++ b/.forgejo/workflows/deploy.yml @@ -7,18 +7,23 @@ on: jobs: deploy: runs-on: docker - steps: - name: Checkout repo uses: actions/checkout@v4 - - name: Deploy AstraOS folder - uses: appleboy/scp-action@v0.1.7 - with: - host: 127.0.0.1 - username: astraos - key: ${{ secrets.DEPLOY_KEY }} - port: 22 - source: "AstraOS/*" - target: "/home/astraos/Astra-OS-Panel" - overwrite: true \ No newline at end of file + - name: Install rsync + ssh + run: | + apt-get update + apt-get install -y rsync openssh-client + + - name: Add SSH key + run: | + mkdir -p ~/.ssh + echo "${{ secrets.DEPLOY_KEY }}" > ~/.ssh/id_ed25519 + chmod 600 ~/.ssh/id_ed25519 + ssh-keyscan -p 22 127.0.0.1 >> ~/.ssh/known_hosts + + - name: Deploy AstraOS folder to server + run: | + rsync -av --delete \ + ./AstraOS/ astraos@127.0.0.1:/home/astraos/Astra-OS-Panel/ \ No newline at end of file From fdfa0e48a0c6e4d089087f8494dad2307a14a4c6 Mon Sep 17 00:00:00 2001 From: MrWhiff Date: Thu, 26 Feb 2026 23:24:33 +0000 Subject: [PATCH 3/7] Auto Deploy fixed v2 --- .forgejo/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yml index 88e0a79..01aa67d 100644 --- a/.forgejo/workflows/deploy.yml +++ b/.forgejo/workflows/deploy.yml @@ -21,9 +21,9 @@ jobs: mkdir -p ~/.ssh echo "${{ secrets.DEPLOY_KEY }}" > ~/.ssh/id_ed25519 chmod 600 ~/.ssh/id_ed25519 - ssh-keyscan -p 22 127.0.0.1 >> ~/.ssh/known_hosts + ssh-keyscan -p 22 116.203.131.247 >> ~/.ssh/known_hosts - name: Deploy AstraOS folder to server run: | rsync -av --delete \ - ./AstraOS/ astraos@127.0.0.1:/home/astraos/Astra-OS-Panel/ \ No newline at end of file + ./AstraOS/ astraos@116.203.131.247:/home/astraos/Astra-OS-Panel/ \ No newline at end of file From 8ebfab1461117b4af6af7fc8b9b46c434e387a54 Mon Sep 17 00:00:00 2001 From: MrWhiff Date: Thu, 26 Feb 2026 23:28:02 +0000 Subject: [PATCH 4/7] Auto Deploy fixed v3 --- .forgejo/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yml index 01aa67d..5c23fd3 100644 --- a/.forgejo/workflows/deploy.yml +++ b/.forgejo/workflows/deploy.yml @@ -19,7 +19,7 @@ jobs: - name: Add SSH key run: | mkdir -p ~/.ssh - echo "${{ secrets.DEPLOY_KEY }}" > ~/.ssh/id_ed25519 + printf "%s" "${{ secrets.DEPLOY_KEY }}" | tr -d '\r' > ~/.ssh/id_ed25519 chmod 600 ~/.ssh/id_ed25519 ssh-keyscan -p 22 116.203.131.247 >> ~/.ssh/known_hosts From b5ea279e42eaa1882ed18a86f43adcc518b3926a Mon Sep 17 00:00:00 2001 From: MrWhiff Date: Thu, 26 Feb 2026 23:31:49 +0000 Subject: [PATCH 5/7] Deploy fix v4 --- .forgejo/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yml index 5c23fd3..f3a144c 100644 --- a/.forgejo/workflows/deploy.yml +++ b/.forgejo/workflows/deploy.yml @@ -19,7 +19,7 @@ jobs: - name: Add SSH key run: | mkdir -p ~/.ssh - printf "%s" "${{ secrets.DEPLOY_KEY }}" | tr -d '\r' > ~/.ssh/id_ed25519 + echo "${{ secrets.DEPLOY_KEY_B64 }}" | base64 -d > ~/.ssh/id_ed25519 chmod 600 ~/.ssh/id_ed25519 ssh-keyscan -p 22 116.203.131.247 >> ~/.ssh/known_hosts From 6a0c4c249bc1e0d797a568dd4bf40492a2b9a28a Mon Sep 17 00:00:00 2001 From: MrWhiff Date: Thu, 26 Feb 2026 23:37:17 +0000 Subject: [PATCH 6/7] delete deploy fixed --- .forgejo/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yml index f3a144c..9950787 100644 --- a/.forgejo/workflows/deploy.yml +++ b/.forgejo/workflows/deploy.yml @@ -25,5 +25,5 @@ jobs: - name: Deploy AstraOS folder to server run: | - rsync -av --delete \ + rsync -av \ ./AstraOS/ astraos@116.203.131.247:/home/astraos/Astra-OS-Panel/ \ No newline at end of file From e0ebc2b201d5f092d14bcf6d9c18d9f60e7f8876 Mon Sep 17 00:00:00 2001 From: MrWhiff Date: Thu, 26 Feb 2026 23:41:38 +0000 Subject: [PATCH 7/7] =?UTF-8?q?AstraOS/requirements.txt=20gel=C3=B6scht?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AstraOS/requirements.txt | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 AstraOS/requirements.txt diff --git a/AstraOS/requirements.txt b/AstraOS/requirements.txt deleted file mode 100644 index 2fdf5bb..0000000 --- a/AstraOS/requirements.txt +++ /dev/null @@ -1,12 +0,0 @@ -Flask -pymongo -werkzeug -Flask-WTF -paramiko -requests -Flask-SocketIO -gunicorn -eventlet -ipaddress -python-dotenv -