diff --git a/src/download-caddy.sh b/src/download-caddy.sh index 8985b0a..b5fd2ec 100644 --- a/src/download-caddy.sh +++ b/src/download-caddy.sh @@ -27,10 +27,13 @@ _install_caddy_service() { if [[ $systemd ]]; then # cp -f ${caddy_tmp}init/linux-systemd/caddy.service /lib/systemd/system/ - if ! wget https://raw.githubusercontent.com/caddyserver/caddy/master/dist/init/linux-systemd/caddy.service -O /lib/systemd/system/caddy.service; then - echo -e "$red 下载 caddy.service 失败!$none" && exit 1 + # if ! wget https://raw.githubusercontent.com/caddyserver/caddy/master/dist/init/linux-systemd/caddy.service -O /lib/systemd/system/caddy.service; then + # echo -e "$red 下载 caddy.service 失败!$none" && exit 1 + # fi + # sed -i "s/-log-timestamps=false//g" /lib/systemd/system/caddy.service + if [[ ! $(grep "ReadWriteDirectories" /lib/systemd/system/caddy.service) ]]; then + sed -i "/ReadWritePaths/a ReadWriteDirectories=/etc/ssl/caddy" /lib/systemd/system/caddy.service fi - sed -i "s/-log-timestamps=false//g" /lib/systemd/system/caddy.service # # sed -i "s/www-data/root/g" /lib/systemd/system/caddy.service # sed -i "/on-abnormal/a RestartSec=3" /lib/systemd/system/caddy.service # sed -i "s/on-abnormal/always/" /lib/systemd/system/caddy.service diff --git a/v2ray.sh b/v2ray.sh index 5c49848..0116f15 100644 --- a/v2ray.sh +++ b/v2ray.sh @@ -10,7 +10,7 @@ none='\e[0m' # Root [[ $(id -u) != 0 ]] && echo -e " 哎呀……请使用 ${red}root ${none}用户运行 ${yellow}~(^_^) ${none}" && exit 1 -_version="v3.24" +_version="v3.25" cmd="apt-get"