Merge branch 'develop' into main

This reverts commit 4482f85ded.

master/main.py

@@ -468,18 +468,22 @@ def home():
     html += "</form>"
 
     html += "<br><h2>Stats</h2><br>"
-    html += "<h3>Workers</h3>"
+    html += "<h2>Workers</h2>"
+    html += "<p>Number of workers: " + str(len(workers)) + "</p>"
+    html += "<p>Workers:</p>"
     html += "<ul>"
     for worker in workers:
-        html += "<li>Name: " + worker.split(':')[0] + " | IP: " + worker.split(':')[2].strip('\n') + "</li>"
+        html += "<li>Name: " + worker.split(':')[0] + " | IP " + worker.split(':')[2].strip('\n') + "</li>"
     html += "</ul>"
-    html += "<h3>Sites</h3>"
+    html += "<h2>Sites</h2>"
-    html += "<p>Total sites: " + str(len(sites)) + "</p>"
+    html += "<p>Number of sites: " + str(len(sites)) + "</p>"
+    html += "<p>Sites:</p>"
     html += "<ul>"
     for site in sites:
-        html += "<li>Domain: <a href=\"https://" + site.split(':')[0] + "\" target=\"_blank\">"+site.split(':')[0]+"</a> | Worker: " + site.split(':')[1].strip('\n') + "</li>"
+        html += "<li>Domain: " + site.split(':')[0] + " | Worker: " + site.split(':')[1].strip('\n') + "</li>"
     html += "</ul>"
-    html += "<h3>Number of unclaimed licences: " + str(len(licences)) + "</h3>"
+    html += "<h2>Licences</h2>"
+    html += "<p>Number of licences: " + str(len(licences)) + "</p>"
 
     html += "<h2><a href='/admin'>Admin</a></h2>"
     return html

worker/install.sh

@@ -24,21 +24,6 @@ python3 -m pip install -r requirements.txt
 cp .env.example .env
 chmod +x wp.sh tlsa.sh
 
-# Add proxy to docker
-mkdir ~/.docker
-echo """{
-  \"proxies\": {
-    \"default\": {
-      \"httpProxy\": \"http://proxy.hnsproxy.au:80\",
-      \"httpsProxy\": \"https://proxy.hnsproxy.au:443\",
-      \"noProxy\": \"localhost\"
-    }
-  }
-}""" > ~/.docker/config.json
-
-# Restart docker
-sudo systemctl restart docker
-
 # Pull docker images to save time later
 docker pull mysql:5.7 &
 docker pull wordpress:latest &

worker/wp.sh

@@ -56,16 +56,9 @@ services:
       WORDPRESS_DB_PASSWORD: $MYSQL_PASSWORD
       WORDPRESS_DB_NAME: WordPressDatabase
     volumes:
-      - data:/var/www/html
+      [\"./:/var/www/html\"]
-    
 volumes:
-  mysql:
+  mysql: {}
-  data:
-    driver: local
-    driver_opts:
-      o: "size=5g,uid=1000"
-      device: tmpfs
-      type: tmpfs
 """ > docker-compose.yml
 
 # Start the containers