Updates for new ver

caddy/_default.env

@@ -1,8 +0,0 @@
-# Service settings specific to this server 
-
-# Image settings
-IMAGE_REGISTRY="docker.io"
-IMAGE_REPO="caddy"
-
-DATA_VOLUME=caddy_data
-CONFIG_VOLUME=caddy_config

caddy/config/.template_info.env

@@ -1,2 +1,13 @@
 # Template to use - always required!
 TEMPLATE=caddy
+REQUIRES_HOST_ROOT=false
+REQUIRES_DOCKER=true
+REQUIRES_DOCKER_ROOT=true
+
+# Image settings
+IMAGE_REGISTRY="docker.io"
+IMAGE_REPO="caddy"
+
+# Volume settings
+DATA_VOLUME=caddy_data
+CONFIG_VOLUME=caddy_config

caddy/config/service.env

@@ -1,10 +1,7 @@
 # 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)
+# (can also override anything in the .template_info.env file in the template to make it specific to this server)
 CONTAINER_NAME=caddy
 IMAGE_TAG="latest"
 
-# Scripts will have these environment variables set, plus those in _default.env, plus:
+# Server Settings
-# SERVER, SERVICE, CONFIG_PATH
+SSH_USER="root"
-# CONFIG_PATH points to this directory!
-
-

simple-object-storage/_default.env

@@ -1,12 +0,0 @@
-# Service settings specific to this server 
-
-# Image settings
-IMAGE_REGISTRY="gitea.jde.nz"
-IMAGE_REPO="public/simple-object-storage"
-IMAGE_TAG="latest"
-
-# Container settings
-CONTAINER_NAME="simple-object-storage"
-
-# Volume settings
-VOLUME_NAME="simple-object-storage"

simple-object-storage/config/.template_info.env

@@ -1,2 +1,17 @@
 # Template to use - always required!
 TEMPLATE=simple-object-storage
+REQUIRES_HOST_ROOT=false
+REQUIRES_DOCKER=true
+REQUIRES_DOCKER_ROOT=true
+
+
+# Image settings
+IMAGE_REGISTRY="gitea.jde.nz"
+IMAGE_REPO="public/simple-object-storage"
+IMAGE_TAG="latest"
+
+# Container settings
+CONTAINER_NAME="simple-object-storage"
+
+# Volume settings
+VOLUME_NAME="simple-object-storage"

simple-object-storage/config/service.env

@@ -1,4 +1,10 @@
+# Service settings specific to this server 
+# (can also override anything in the .template_info.env file in the template to make it specific to this server)
+
 # note the port and write tokens are not set here, they are set in the sos_config.json file.
 
 CONTAINER_NAME="simple-object-storage"
 VOLUME_NAME="simple-object-storage"
+
+# Server Settings
+SSH_USER="root"

squashkiwi/_default.env

@@ -1,10 +0,0 @@
-# Application settings
-CONTAINER_PORT=8181
-
-# Deployment settings
-CONTAINER_NAME="squashkiwi"
-
-# Image settings
-IMAGE_REGISTRY="gitea.jde.nz"
-IMAGE_REPO="squashkiwi/squashkiwi"
-IMAGE_TAG="latest"

squashkiwi/config/.template_info.env

@@ -1,2 +1,16 @@
 # Template to use - always required!
 TEMPLATE=squashkiwi
+REQUIRES_HOST_ROOT=false
+REQUIRES_DOCKER=true
+REQUIRES_DOCKER_ROOT=true
+
+# Application settings
+CONTAINER_PORT=8181
+
+# Deployment settings
+CONTAINER_NAME="squashkiwi"
+
+# Image settings
+IMAGE_REGISTRY="gitea.jde.nz"
+IMAGE_REPO="squashkiwi/squashkiwi"
+IMAGE_TAG="latest"

squashkiwi/config/service.env

@@ -1,6 +1,9 @@
 # Service settings specific to this server 
-# (can also override anything in the _basic.env file in the template to make it specific to this server)
+# (can also override anything in the .template_info.env file in the template to make it specific to this server)
 
 HOST_PORT=80
 LOCAL_DATA_FOLDER="/home/dropshell/example-squashkiwi"
 IMAGE_TAG="latest"
+
+# Server Settings
+SSH_USER="root"

static-website/_default.env

@@ -1,5 +0,0 @@
-# Service settings specific to this server 
-
-# Image settings
-IMAGE_REGISTRY="docker.io"
-IMAGE_REPO="nginx"

static-website/config/.template_info.env

@@ -1,2 +1,8 @@
 # Template to use - always required!
 TEMPLATE=static-website
+REQUIRES_HOST_ROOT=false
+REQUIRES_DOCKER=true
+REQUIRES_DOCKER_ROOT=true
+
+IMAGE_REGISTRY="docker.io"
+IMAGE_REPO="nginx"

static-website/config/service.env

@@ -1,12 +1,12 @@
 # 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)
+# (can also override anything in the .template_info.env file in the template to make it specific to this server)
+
 HOST_PORT=60123
 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:
+# Server Settings
-# SERVER, SERVICE, CONFIG_PATH
+SSH_USER="root"
-# CONFIG_PATH points to this directory!
 
 

watchtower/_default.env

@@ -1,11 +0,0 @@
-# Service settings
-CONTAINER_NAME=watchtower
-
-# Interval in seconds between checks.
-# Default is 1800 seconds (30 minutes).
-INTERVAL=1800
-
-# Image settings
-IMAGE_REGISTRY="docker.io"
-IMAGE_REPO="containrrr/watchtower"
-IMAGE_TAG="latest"

watchtower/config/.template_info.env

@@ -1,3 +1,14 @@
 # Template to use - always required!
 TEMPLATE=watchtower
+REQUIRES_HOST_ROOT=false
+REQUIRES_DOCKER=true
+REQUIRES_DOCKER_ROOT=true
+
+# Service settings
+CONTAINER_NAME=watchtower
+
+# Image settings
+IMAGE_REGISTRY="docker.io"
+IMAGE_REPO="containrrr/watchtower"
+IMAGE_TAG="latest"
 

watchtower/config/service.env

@@ -1,6 +1,9 @@
 # Service settings specific to this server 
-# (can also override anything in the _basic.env file in the template to make it specific to this server)
+# (can also override anything in the .template_info.env file in the template to make it specific to this server)
 
 # Interval in seconds between checks.
 # Default is 1800 seconds (30 minutes).
 INTERVAL=1800
+
+# Server Settings
+SSH_USER="root"