fix: reuse existing Caddy binary and preserve Caddyfile on install

2026-07-07 23:47:56 +08:00
parent 906ee96282
commit a3e048b949
3 changed files with 18 additions and 6 deletions
@@ -3,7 +3,12 @@ caddy_config() {
    case $1 in
    new)
        mkdir -p $is_caddy_dir $is_caddy_dir/sites $is_caddy_conf
-        cat >$is_caddyfile <<-EOF
+        if [[ -f $is_caddyfile ]]; then
+            [[ ! $(grep -F "$is_caddy_conf/*.conf" $is_caddyfile) ]] && {
+                echo -e "\nimport $is_caddy_conf/*.conf" >>$is_caddyfile
+            }
+        else
+            cat >$is_caddyfile <<-EOF
 # caddy configuration #
 {
  admin off
@@ -13,6 +18,7 @@ caddy_config() {
 import $is_caddy_conf/*.conf
 import $is_caddy_dir/sites/*.conf
 EOF
+        fi
        ;;
    *ws* | *http*)
        cat >${is_caddy_site_file} <<<"