From 7431af5d95f3b595db90fefa42ce3f1722ef1507 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.gruenhage@siemens.com>
Date: Mon, 19 Feb 2018 16:44:07 +0100
Subject: [PATCH] chore: move Caddyfile from /etc to /etc/caddy

move Caddyfile, so that it can be in a volume.
when using volumes and not bind mounts one can not simply mount a whole directory,
after this change mounting /etc/caddy works as intended
---
 Dockerfile              |  2 +-
 root/etc/s6.d/caddy/run | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d8fe5be..42aaedf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,4 +2,4 @@ FROM docker.jcg.re/base-caddy
 RUN apk add --no-cache bash
 ADD root /
 EXPOSE 2015 80 443
-VOLUME ["/caddy", "/var/www"]
+VOLUME ["/etc/caddy", "/var/www"]
diff --git a/root/etc/s6.d/caddy/run b/root/etc/s6.d/caddy/run
index 272eaf8..feb86ce 100755
--- a/root/etc/s6.d/caddy/run
+++ b/root/etc/s6.d/caddy/run
@@ -1,8 +1,8 @@
 #!/bin/bash
 if [[ -z ${CADDYPATH} ]]; then
-	export CADDYPATH=/caddy
+	export CADDYPATH=/etc/caddy
 fi
-P="--conf /etc/Caddyfile"
+P="--conf ${CADDYPATH}/Caddyfile"
 if [[ -n ${USE_QUIC} ]]; then
 	P="-quic $P"
 fi
@@ -11,12 +11,12 @@ if [[ -n ${LE_STAGING} ]]; then
 fi
 chown -R ${UID}:${GID} /var/www
 chown -R ${UID}:${GID} ${CADDYPATH}
-if [[ ! -f /etc/Caddyfile ]]; then
+if [[ ! -f ${CADDYPATH}/Caddyfile ]]; then
 	if [[ -z "$DOMAIN" || -z "$EMAIL" ]]; then
-		cp /etc/Caddyfile.insecure.template /etc/Caddyfile
+		cp /etc/Caddyfile.insecure.template ${CADDYPATH}/Caddyfile
 	else
-		cp /etc/Caddyfile.secure.template /etc/Caddyfile
-		sed -i -e "s/DOMAIN/${DOMAIN}/" -e "s/EMAIL/${EMAIL}/" /etc/Caddyfile
+		cp /etc/Caddyfile.secure.template ${CADDYPATH}/Caddyfile
+		sed -i -e "s/DOMAIN/${DOMAIN}/" -e "s/EMAIL/${EMAIL}/" ${CADDYPATH}/Caddyfile
 	fi
 fi
 cd ${CADDYPATH}