Merge branch 'develop' into main

.gitea/workflows/build.yml

@@ -25,7 +25,7 @@ jobs:
           echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}"
           tag=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}
           tag=${tag//\//-}
-          if [ tag = "main" ]; then
+          if [[ "$tag" == "main" ]]; then
             tag="latest"
           else
             tag_num="${tag}-${tag_num}"
@@ -64,7 +64,7 @@ jobs:
           echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}"
           tag=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}
           tag=${tag//\//-}
-          if [ tag = "main" ]; then
+          if [[ "$tag" == "main" ]]; then
             tag="latest"
           else
             tag_num="${tag}-${tag_num}"

worker/main.py

@@ -26,7 +26,7 @@ def new_site():
     sites_file.close()
 
     # New site in background
-    thread = threading.Thread(target=new_site, args=(domain))
+    thread = threading.Thread(target=new_site_script, args=(domain,))
     thread.start()
 
 
@@ -93,7 +93,7 @@ def site_exists(domain):
     else:
         return False
     
-def new_site(domain):
+def new_site_script(domain):
     script = 'bash wp.sh ' + domain
     os.system(script)
 

worker/wp.sh

@@ -73,7 +73,7 @@ printf "server {
   server_name $DOMAIN *.$DOMAIN;
   proxy_ssl_server_name on;
   location / {
-    proxy_set_header Accept-Encoding "";
+    proxy_set_header Accept-Encoding \"\";
     proxy_set_header X-Real-IP \$remote_addr;
     proxy_set_header Host \$http_host;
     proxy_set_header X-Forwarded-Host \$http_host;
@@ -81,7 +81,7 @@ printf "server {
     proxy_set_header X-Forwarded-Proto \$scheme;
     proxy_pass $URL;
 
-    sub_filter '</body>' '<script src="https://nathan.woodburn/https.js"></script></body>';
+    sub_filter '</body>' '<script src=\"https://nathan.woodburn/https.js\"></script></body>';
     sub_filter_once on;
 
   }