Merge branch 'develop' into main

.gitea/workflows/build.yml

@@ -21,12 +21,10 @@ jobs:
         run : |          
           cd master
           echo "${{ secrets.DOCKERGIT_TOKEN }}" | docker login git.woodburn.au -u nathanwoodburn --password-stdin
+          tag_num=$(git rev-parse --short HEAD)
           echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}"
           tag=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}
           tag=${tag//\//-}
-          tag_num=${GITHUB_RUN_NUMBER}
-          echo "tag_num=$tag_num"          
-
           if [[ "$tag" == "main" ]]; then
             tag="latest"
           else
@@ -62,10 +60,10 @@ jobs:
         run : |          
           cd discord-bot
           echo "${{ secrets.DOCKERGIT_TOKEN }}" | docker login git.woodburn.au -u nathanwoodburn --password-stdin
+          tag_num=$(git rev-parse --short HEAD)
           echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}"
           tag=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}
           tag=${tag//\//-}
-          tag_num=${GITHUB_RUN_NUMBER}
           if [[ "$tag" == "main" ]]; then
             tag="latest"
           else
@@ -76,4 +74,5 @@ jobs:
           docker tag hnshosting-bot:$tag_num git.woodburn.au/nathanwoodburn/hnshosting-bot:$tag_num
           docker push git.woodburn.au/nathanwoodburn/hnshosting-bot:$tag_num
           docker tag hnshosting-bot:$tag_num git.woodburn.au/nathanwoodburn/hnshosting-bot:$tag
-          docker push git.woodburn.au/nathanwoodburn/hnshosting-bot:$tag
+          docker push git.woodburn.au/nathanwoodburn/hnshosting-bot:$tag
+          

.gitea/workflows/release.yml

@@ -1,16 +0,0 @@
-name: Build Docker for Release
-run-name: Build Docker Images
-
-on: 
-  push:
-    tags:
-      - '*'
-
-jobs:
-  TEST:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Print tag
-        run: echo "tag=${GITHUB_REF#refs/tags/}"

discord-bot/bot.py

@@ -3,7 +3,6 @@ from dotenv import load_dotenv
 import discord
 from discord import app_commands
 import requests
-import asyncio
 
 load_dotenv()
 TOKEN = os.getenv('DISCORD_TOKEN')
@@ -70,22 +69,7 @@ async def createsite(ctx, domain: str, licence: str):
     if r.status_code == 200:
         json = r.json()
         if json['success'] == "true":
-            await ctx.response.send_message(f"Site {domain} creating...\nI'll send you a message when it's ready")
-
-            ready = False
-            while ready == False:
-                ready = await check_site_ready(domain)
-                if ready == False:
-                    await asyncio.sleep(5)
-
-            r = requests.get(f"http://{Master_IP}:{Master_Port}/site-info?domain={domain}")
-            json = r.json()
-            if json['success'] == "true":
-                await ctx.user.send(f"Site {domain} is ready!\nHere is the site info for {json['domain']}\nA: `{json['ip']}`\nTLSA: `{json['tlsa']}`\nMake sure you put the TLSA in either `_443._tcp.{domain}` or `*.{domain}`")
-            else:
-                await ctx.user.send(f"Error getting site info\n" + json['error'])
-
-
+            await ctx.response.send_message(f"Site {domain} creating...\nPlease wait a few minutes and then send /siteinfo domain:{domain}")
         else:
             await ctx.response.send_message(f"Error creating site\n" + json['error'])
     else:
@@ -104,17 +88,6 @@ async def siteinfo(ctx, domain: str):
     else:
         await ctx.response.send_message(f"Error getting site info\n" + r.text)
 
-async def check_site_ready(domain):
-    r = requests.get(f"http://{Master_IP}:{Master_Port}/site-info?domain={domain}")
-    if r.status_code == 200:
-        json = r.json()
-        if json['success'] == "true":
-            return True
-        else:
-            return False
-    else:
-        return False
-
 # When the bot is ready
 @client.event
 async def on_ready():

worker/install.sh

@@ -11,7 +11,6 @@ KERNEL_VERSION=$(uname -r)
 sudo apt-mark hold linux-image-generic linux-headers-generic linux-generic linux-image-$KERNEL_VERSION linux-headers-$KERNEL_VERSION
 
 # Install Docker
-sudo apt update
 sudo apt install apt-transport-https ca-certificates curl software-properties-common python3-pip nginx -y
 curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
 echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null