master/main.py

@@ -168,7 +168,7 @@ def list_workers():
     for worker in workers:
         # Check worker status
         if not worker.__contains__(':'):
-            continue
+            return jsonify({'error': 'No workers available', 'success': 'false'})
 
         online=True
         resp=requests.get("http://"+worker.split(':')[1].strip('\n') + ":5000/status",timeout=2)
@@ -178,9 +178,7 @@ def list_workers():
             continue
         sites = resp.json()['num_sites']
         worker_list.append({'worker': worker.split(':')[0],'ip': worker.split(':')[1].strip('\n'), 'online': online, 'sites': sites, 'ready': 1})
-    
-    if len(worker_list) == 0:
-        return jsonify({'error': 'No workers available', 'success': 'false'})
+        
     return jsonify({'success': 'true', 'workers': worker_list})
 
 @app.route('/site-info', methods=['GET'])

worker/install.sh

@@ -2,28 +2,23 @@
 # Initial install for all prerequisites for the project.
 # This makes it quicker to get each site up and running.
 
-# Stop kernel prompts
-export DEBIAN_FRONTEND=noninteractive
-export NEEDRESTART_MODE=a
-echo "Dpkg::Options { \"--force-confdef\"; \"--force-confold\"; };" | sudo tee /etc/apt/apt.conf.d/local
-
-KERNEL_VERSION=$(uname -r)
-sudo apt-mark hold linux-image-generic linux-headers-generic linux-generic linux-image-$KERNEL_VERSION linux-headers-$KERNEL_VERSION
+# Update the system
+sudo apt update && sudo apt upgrade -y
 
 # Install Docker
-sudo apt install apt-transport-https ca-certificates curl software-properties-common python3-pip nginx -y
+sudo apt install apt-transport-https ca-certificates curl software-properties-common -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
 sudo apt update
 apt-cache policy docker-ce
-sudo apt install docker-ce docker-compose -y
+sudo apt install docker-ce -y
+sudo apt install docker-compose -y
+
+# Install NGINX
+sudo apt install nginx -y
 
 # Install python prerequisites
+sudo apt install python3-pip -y
 python3 -m pip install -r requirements.txt
 cp .env.example .env
 chmod +x wp.sh tlsa.sh
-
-# Pull docker images to save time later
-docker pull mysql:5.7 &
-docker pull wordpress:latest &
-wait