From 42240062da5a6d95a5d03ce13aad52deff67b44f Mon Sep 17 00:00:00 2001
From: Basil Hendroff <63370329+basilhendroff@users.noreply.github.com>
Date: Sun, 2 Aug 2020 00:44:21 +0800
Subject: [PATCH] Do not overwrite Caddyfile if it already exists

cp -n (copy noclobber) displays a failed copy message if a Caddyfile already exists
The new logic avoids any error message. It only copies a sample Caddyfile if A Caddyfile doesn't already exist.
---
 caddy-jail.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/caddy-jail.sh b/caddy-jail.sh
index d856691..661264c 100755
--- a/caddy-jail.sh
+++ b/caddy-jail.sh
@@ -148,7 +148,7 @@ fi
 
 # Copy pre-written config files
 iocage exec "${JAIL_NAME}" cp -f /mnt/includes/caddy /usr/local/etc/rc.d/
-iocage exec "${JAIL_NAME}" cp -n /mnt/includes/Caddyfile /usr/local/www/Caddyfile
+iocage exec "${JAIL_NAME}" [ ! -f "/mnt/tank/caddy/Caddyfile" ] && cp -f freenas-iocage-caddy/includes/Caddyfile /mnt/tank/caddy/Caddyfile
 
 iocage exec "${JAIL_NAME}" sysrc caddy_enable="YES"
 iocage exec "${JAIL_NAME}" sysrc caddy_config="/usr/local/www/Caddyfile"