Update scripts.

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

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
 

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:

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}..."

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
 

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
 

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..."
 

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

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
 

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.

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."

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}"