diff --git a/caddy/config/Caddyfile b/caddy/config/caddyfile/Caddyfile similarity index 100% rename from caddy/config/Caddyfile rename to caddy/config/caddyfile/Caddyfile diff --git a/caddy/config/static/index.html b/caddy/config/static/index.html index cd8f430..8c0081f 100644 --- a/caddy/config/static/index.html +++ b/caddy/config/static/index.html @@ -4,6 +4,6 @@

Static Site

-

This is a static site.

+

This is a static site, served by Caddy.

\ No newline at end of file diff --git a/caddy/install.sh b/caddy/install.sh index 8b3cbb8..6d31e47 100755 --- a/caddy/install.sh +++ b/caddy/install.sh @@ -8,7 +8,7 @@ _check_docker_installed || _die "Docker test failed, aborting installation..." docker pull "$IMAGE_REGISTRY/$IMAGE_REPO:$IMAGE_TAG" || _die "Failed to pull image $IMAGE_REGISTRY/$IMAGE_REPO:$IMAGE_TAG" -[ -f "${CONFIG_PATH}/Caddyfile" ] || _die "Caddyfile not found in ${CONFIG_PATH}!" +[ -f "${CONFIG_PATH}/caddyfile/Caddyfile" ] || _die "Caddyfile not found in ${CONFIG_PATH}/caddyfile/Caddyfile!" bash ./stop.sh || _die "Failed to stop container ${CONTAINER_NAME}" _remove_container $CONTAINER_NAME || _die "Failed to remove container ${CONTAINER_NAME}" diff --git a/caddy/start.sh b/caddy/start.sh index 19b6664..944cc92 100755 --- a/caddy/start.sh +++ b/caddy/start.sh @@ -6,15 +6,19 @@ _check_required_env_vars # The start script is required for all templates. # It is used to start the service on the server. +if [ ! -f "${CONFIG_PATH}/caddyfile/Caddyfile" ]; then + _die "Caddyfile not found in ${CONFIG_PATH}/caddyfile/Caddyfile" +fi DOCKER_RUN_CMD="docker run -d \ --restart unless-stopped \ --name ${CONTAINER_NAME} \ + --cap-add=NET_ADMIN \ -p 80:80 \ -p 443:443 \ -p 443:443/udp \ - -v ${CONFIG_PATH}/Caddyfile:/etc/caddy/Caddyfile \ + -v ${CONFIG_PATH}/caddyfile:/etc/caddy \ -v ${DATA_VOLUME}:/data \ -v ${CONFIG_VOLUME}:/config \ -v ${CONFIG_PATH}/static:/srv \ diff --git a/simple-object-storage/_default.env b/simple-object-storage/_default.env index a214437..802395b 100644 --- a/simple-object-storage/_default.env +++ b/simple-object-storage/_default.env @@ -2,7 +2,7 @@ # Image settings IMAGE_REGISTRY="gitea.jde.nz" -IMAGE_REPO="j/simple-object-storage" +IMAGE_REPO="public/simple-object-storage" IMAGE_TAG="latest" # Container settings