From bbd7c635a8e12573fa49bd1030a00ddb5012b929 Mon Sep 17 00:00:00 2001
From: Your Name <j@842.be>
Date: Sun, 4 May 2025 22:35:51 +1200
Subject: [PATCH] Update scripts.

---
 src/servers.cpp                            | 7 +++++++
 src/service_runner.cpp                     | 2 +-
 src/services.cpp                           | 4 ++--
 templates/caddy/logs.sh                    | 4 ++--
 templates/caddy/start.sh                   | 2 +-
 templates/example-nginx/config/service.env | 4 ++--
 templates/example-nginx/install.sh         | 4 ----
 templates/example-nginx/start.sh           | 2 +-
 templates/simple-object-storage/start.sh   | 2 +-
 templates/watchtower/install.sh            | 4 ----
 templates/watchtower/logs.sh               | 4 ----
 templates/watchtower/start.sh              | 4 ----
 templates/watchtower/status.sh             | 4 ----
 templates/watchtower/stop.sh               | 4 ----
 templates/watchtower/uninstall.sh          | 4 ----
 15 files changed, 17 insertions(+), 38 deletions(-)

diff --git a/src/servers.cpp b/src/servers.cpp
index 976060c..103631e 100644
--- a/src/servers.cpp
+++ b/src/servers.cpp
@@ -78,6 +78,9 @@ void list_servers() {
     tableprint tp("All DropShell Servers");
     tp.add_row({"Name", "User", "Address", "Health", "Ports"});
 
+    std::cout << "Checking "<<servers.size() << " servers: " << std::flush;
+    int checked = 0;
+
     transwarp::parallel exec{servers.size()};
     auto task = transwarp::for_each(exec, servers.begin(), servers.end(), [&](const ServerInfo& server) {
         std::map<std::string, ServiceStatus> status = service_runner::get_all_services_status(server.name); 
@@ -93,8 +96,12 @@ void list_servers() {
             ports_used_str += std::to_string(port) + " ";
         
         tp.add_row({server.name, server.ssh_user, server.ssh_host, serviceticks, ports_used_str});
+        ++checked;
+        // print out a tick character for each server checked.
+        std::cout << checked << " ✓  " << std::flush;
     });
     task->wait();
+    std::cout << std::endl << std::endl;
     tp.print();
 }
 
diff --git a/src/service_runner.cpp b/src/service_runner.cpp
index 777211e..9197c24 100644
--- a/src/service_runner.cpp
+++ b/src/service_runner.cpp
@@ -79,7 +79,7 @@ bool service_runner::install() {
         }
     }
     
-    // Copy service files (including service.env)
+    // Copy service files
     {
         std::string local_service_path = localpath::service(mServer,mService);
         if (local_service_path.empty() || !fs::exists(local_service_path)) {
diff --git a/src/services.cpp b/src/services.cpp
index 4aaa973..43860e7 100644
--- a/src/services.cpp
+++ b/src/services.cpp
@@ -66,7 +66,7 @@ LocalServiceInfo get_service_info(const std::string &server_name, const std::str
     std::map<std::string, std::string> variables;
     get_all_service_env_vars(server_name, service_name, variables);
  
-    // load the service.env file
+    // confirm TEMPLATE is defined.
     auto it = variables.find("TEMPLATE");
     if (it == variables.end()) {
         std::cerr << "Error: TEMPLATE variable not defined in service " << service_name << " on server " << server_name << std::endl;
@@ -199,7 +199,7 @@ bool create_service(const std::string &server_name, const std::string &template_
         std::cout << "Service " << service_name <<" created successfully"<<std::endl;
         std::cout << std::endl;
         std::cout << "To complete the installation, please:" << std::endl;
-        std::cout << "1. edit the service.env file:     dropshell edit " << server_name << " " << service_name << std::endl;
+        std::cout << "1. edit the service config file:  dropshell edit " << server_name << " " << service_name << std::endl;
         std::cout << "2. install the remote service:    dropshell install " << server_name << " " << service_name << std::endl;
     }
     return true;
diff --git a/templates/caddy/logs.sh b/templates/caddy/logs.sh
index 227f617..c1b820f 100644
--- a/templates/caddy/logs.sh
+++ b/templates/caddy/logs.sh
@@ -4,6 +4,6 @@ _check_required_env_vars
 
 # Main script.
 echo "Container ${CONTAINER_NAME} logs:"
-grey_start
+_grey_start
 docker logs "${CONTAINER_NAME}"
-grey_end
+_grey_end
diff --git a/templates/caddy/start.sh b/templates/caddy/start.sh
index 23a99ee..5f2ec6f 100644
--- a/templates/caddy/start.sh
+++ b/templates/caddy/start.sh
@@ -21,7 +21,7 @@ DOCKER_RUN_CMD="docker run -d \
                 ${IMAGE_REGISTRY}/${IMAGE_REPO}:${IMAGE_TAG}"
 
 
-if ! create_and_start_container "$DOCKER_RUN_CMD" "$CONTAINER_NAME"; then
+if ! _create_and_start_container "$DOCKER_RUN_CMD" "$CONTAINER_NAME"; then
     _die "Failed to start container ${CONTAINER_NAME}"
 fi
 
diff --git a/templates/example-nginx/config/service.env b/templates/example-nginx/config/service.env
index 33987c7..08ab81d 100644
--- a/templates/example-nginx/config/service.env
+++ b/templates/example-nginx/config/service.env
@@ -1,8 +1,8 @@
 # Service settings specific to this server 
 # (can also override anything in the _default.env file in the template to make it specific to this server)
 HOST_PORT=60123
-LOCAL_DATA_FOLDER="${HOME}/.example-nginx"
-CONTAINER_NAME=example-nginx
+LOCAL_DATA_FOLDER="/home/dropshell/nginx-example-website"
+CONTAINER_NAME="example-nginx"
 IMAGE_TAG="latest"
 
 # Scripts will have these environment variables set, plus those in _default.env, plus:
diff --git a/templates/example-nginx/install.sh b/templates/example-nginx/install.sh
index b7e2bb6..e93687b 100644
--- a/templates/example-nginx/install.sh
+++ b/templates/example-nginx/install.sh
@@ -4,10 +4,6 @@ _check_required_env_vars "LOCAL_DATA_FOLDER" "IMAGE_REGISTRY" "IMAGE_REPO" "IMAG
 
 # Nginx Example Install Script
 
-
-# Load service environment variables
-source ./service.env
-
 # Ensure local data folder exists
 if [ ! -d "${LOCAL_DATA_FOLDER}" ]; then
     echo "Creating local data folder ${LOCAL_DATA_FOLDER}..."
diff --git a/templates/example-nginx/start.sh b/templates/example-nginx/start.sh
index ca2104a..40438ac 100644
--- a/templates/example-nginx/start.sh
+++ b/templates/example-nginx/start.sh
@@ -18,7 +18,7 @@ DOCKER_RUN_CMD="docker run -d \
                 ${IMAGE_REGISTRY}/${IMAGE_REPO}:${IMAGE_TAG}"
 
 
-if ! create_and_start_container "$DOCKER_RUN_CMD" "$CONTAINER_NAME"; then
+if ! _create_and_start_container "$DOCKER_RUN_CMD" "$CONTAINER_NAME"; then
     _die "Failed to start container ${CONTAINER_NAME}"
 fi
 
diff --git a/templates/simple-object-storage/start.sh b/templates/simple-object-storage/start.sh
index 42f8d95..fc3b8f6 100644
--- a/templates/simple-object-storage/start.sh
+++ b/templates/simple-object-storage/start.sh
@@ -26,7 +26,7 @@ DOCKER_RUN_CMD="docker run -d \
                 ${IMAGE_REGISTRY}/${IMAGE_REPO}:${IMAGE_TAG}"
 
 
-if ! create_and_start_container "$DOCKER_RUN_CMD" "$CONTAINER_NAME"; then
+if ! _create_and_start_container "$DOCKER_RUN_CMD" "$CONTAINER_NAME"; then
     _die "Failed to start container ${CONTAINER_NAME}"
 fi
 
diff --git a/templates/watchtower/install.sh b/templates/watchtower/install.sh
index 7ac2c86..cca77cb 100644
--- a/templates/watchtower/install.sh
+++ b/templates/watchtower/install.sh
@@ -4,10 +4,6 @@ _check_required_env_vars "CONTAINER_NAME" "IMAGE_REGISTRY" "IMAGE_REPO" "IMAGE_T
 
 # Watchtower Install Script
 
-
-# Load service environment variables
-source ./service.env
-
 echo "Checking Docker installation..."
 _check_docker_installed || _die "Docker test failed, aborting installation..."
 
diff --git a/templates/watchtower/logs.sh b/templates/watchtower/logs.sh
index 916614f..cb35945 100644
--- a/templates/watchtower/logs.sh
+++ b/templates/watchtower/logs.sh
@@ -4,10 +4,6 @@ _check_required_env_vars "CONTAINER_NAME"
 
 # Watchtower Logs Script
 
-
-# Load service environment variables
-source ./service.env
-
 echo "Showing logs for ${CONTAINER_NAME}... (Press Ctrl+C to stop)"
 _grey_start
 _get_container_logs $CONTAINER_NAME
diff --git a/templates/watchtower/start.sh b/templates/watchtower/start.sh
index 9c17be0..89cf7ca 100644
--- a/templates/watchtower/start.sh
+++ b/templates/watchtower/start.sh
@@ -4,10 +4,6 @@ _check_required_env_vars
 
 # Watchtower Start Script
 
-
-# Load service environment variables
-source ./service.env
-
 # Optional arguments (e.g., --cleanup, --monitor-only)
 EXTRA_ARGS=$1
 
diff --git a/templates/watchtower/status.sh b/templates/watchtower/status.sh
index 47a18f6..d389f10 100644
--- a/templates/watchtower/status.sh
+++ b/templates/watchtower/status.sh
@@ -4,10 +4,6 @@ _check_required_env_vars "CONTAINER_NAME"
 
 # Watchtower Status Script
 
-
-# Load service environment variables
-source ./service.env
-
 _is_container_running $CONTAINER_NAME || _die "Service is not running - did not find container $CONTAINER_NAME."
 
 # Optional: Add specific health checks for Watchtower if needed.
diff --git a/templates/watchtower/stop.sh b/templates/watchtower/stop.sh
index 1237bd5..7f336ad 100644
--- a/templates/watchtower/stop.sh
+++ b/templates/watchtower/stop.sh
@@ -4,10 +4,6 @@ _check_required_env_vars
 
 # Watchtower Stop Script
 
-
-# Load service environment variables
-source ./service.env
-
 echo "Stopping service ${CONTAINER_NAME}..."
 _stop_container $CONTAINER_NAME || _die "Failed to stop container ${CONTAINER_NAME}"
 echo "Service ${CONTAINER_NAME} stopped."
diff --git a/templates/watchtower/uninstall.sh b/templates/watchtower/uninstall.sh
index 4b78d06..cb839c2 100644
--- a/templates/watchtower/uninstall.sh
+++ b/templates/watchtower/uninstall.sh
@@ -4,10 +4,6 @@ _check_required_env_vars
 
 # Watchtower Uninstall Script
 
-
-# Load service environment variables
-source ./service.env
-
 echo "Uninstalling service ${CONTAINER_NAME}..."
 _remove_container $CONTAINER_NAME || _die "Failed to remove container ${CONTAINER_NAME}"