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.
master
Basil Hendroff 2020-08-02 00:44:21 +08:00 committed by GitHub
parent c2cf799826
commit 42240062da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions

View File

@ -148,7 +148,7 @@ fi
# Copy pre-written config files # Copy pre-written config files
iocage exec "${JAIL_NAME}" cp -f /mnt/includes/caddy /usr/local/etc/rc.d/ 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_enable="YES"
iocage exec "${JAIL_NAME}" sysrc caddy_config="/usr/local/www/Caddyfile" iocage exec "${JAIL_NAME}" sysrc caddy_config="/usr/local/www/Caddyfile"