diff --git a/src/init.sh b/src/init.sh index c3ff148..6d2fb56 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) @@ -96,6 +107,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) @@ -105,17 +122,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 [[ ! $args ]] && args=main main $args diff --git a/src/systemd.sh b/src/systemd.sh index eac3fa1..821c69b 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/xray.sh b/xray.sh index c4ea355..42b369f 100644 --- a/xray.sh +++ b/xray.sh @@ -1,6 +1,6 @@ #!/bin/bash args=$@ -is_sh_ver=v1.19 +is_sh_ver=v1.20 . /etc/xray/sh/src/init.sh \ No newline at end of file