From 4d1279d03807f6c5d727b019f46a3ef130eea0da Mon Sep 17 00:00:00 2001
From: 233boy <31657650+233boy@users.noreply.github.com>
Date: Sun, 2 Jun 2024 17:10:22 +0800
Subject: [PATCH] fix caddy run

---
 src/init.sh    | 28 +++++++++++++++++-----------
 src/systemd.sh |  4 ++--
 v2ray.sh       |  2 +-
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/init.sh b/src/init.sh
index d7895b447..0d1191075 100644
--- a/src/init.sh
+++ b/src/init.sh
@@ -47,6 +47,17 @@ warn() {
     echo -e "\n$is_warn $@\n"
 }
 
+# load bash script.
+load() {
+    . $is_sh_dir/src/$1
+}
+
+# wget add --no-check-certificate
+_wget() {
+    # [[ $proxy ]] && export https_proxy=$proxy
+    wget --no-check-certificate "$@"
+}
+
 # yum or apt-get
 cmd=$(type -P apt-get || type -P yum)
 
@@ -111,6 +122,12 @@ else
 fi
 if [[ -f $is_caddy_bin && -d $is_caddy_dir && $is_caddy_service ]]; then
     is_caddy=1
+    # fix caddy run; ver >= 2.8.2
+    [[ ! $(grep '\-\-adapter caddyfile' /lib/systemd/system/caddy.service) ]] && {
+        load systemd.sh
+        install_service caddy
+        systemctl restart caddy &
+    }
     is_caddy_ver=$($is_caddy_bin version | head -n1 | cut -d " " -f1)
     if [[ $(pgrep -f $is_caddy_bin) ]]; then
         is_caddy_status=$(_green running)
@@ -120,17 +137,6 @@ if [[ -f $is_caddy_bin && -d $is_caddy_dir && $is_caddy_service ]]; then
     fi
 fi
 
-# load bash script.
-load() {
-    . $is_sh_dir/src/$1
-}
-
-# wget add --no-check-certificate
-_wget() {
-    # [[ $proxy ]] && export https_proxy=$proxy
-    wget --no-check-certificate "$@"
-}
-
 load core.sh
 # old sh ver
 is_old_dir=/etc/v2ray/233boy
diff --git a/src/systemd.sh b/src/systemd.sh
index eac3fa157..821c69b4d 100644
--- a/src/systemd.sh
+++ b/src/systemd.sh
@@ -39,8 +39,8 @@ Requires=network-online.target
 Type=notify
 User=root
 Group=root
-ExecStart=$is_caddy_bin run --environ --config $is_caddyfile
-ExecReload=$is_caddy_bin reload --config $is_caddyfile
+ExecStart=$is_caddy_bin run --environ --config $is_caddyfile --adapter caddyfile
+ExecReload=$is_caddy_bin reload --config $is_caddyfile --adapter caddyfile
 TimeoutStopSec=5s
 LimitNPROC=10000
 LimitNOFILE=1048576
diff --git a/v2ray.sh b/v2ray.sh
index d85a492fd..d52da97d7 100644
--- a/v2ray.sh
+++ b/v2ray.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
 args=$@
-is_sh_ver=v4.19
+is_sh_ver=v4.20
 
 . /etc/v2ray/sh/src/init.sh