pull/95/head
233boy 6 years ago
parent 4dd0bd7c9c
commit 989bf6366b
  1. 9
      install.sh
  2. 2
      src/download-caddy.sh

@ -973,7 +973,14 @@ uninstall() {
if [[ -f /usr/bin/v2ray/v2ray && -f /etc/v2ray/config.json ]] && [[ -f $backup && -d /etc/v2ray/233boy/v2ray ]]; then if [[ -f /usr/bin/v2ray/v2ray && -f /etc/v2ray/config.json ]] && [[ -f $backup && -d /etc/v2ray/233boy/v2ray ]]; then
. $backup . $backup
_load uninstall.sh if [[ $mark ]]; then
_load uninstall.sh
else
echo
echo -e " $yellow输入 ${cyan}v2ray uninstall${none} $yellow即可卸载${none}"
echo
fi
elif [[ -f /usr/bin/v2ray/v2ray && -f /etc/v2ray/config.json ]] && [[ -f /etc/v2ray/233blog_v2ray_backup.txt && -d /etc/v2ray/233boy/v2ray ]]; then elif [[ -f /usr/bin/v2ray/v2ray && -f /etc/v2ray/config.json ]] && [[ -f /etc/v2ray/233blog_v2ray_backup.txt && -d /etc/v2ray/233boy/v2ray ]]; then
echo echo
echo -e " $yellow输入 ${cyan}v2ray uninstall${none} $yellow即可卸载${none}" echo -e " $yellow输入 ${cyan}v2ray uninstall${none} $yellow即可卸载${none}"

@ -27,7 +27,7 @@ _install_caddy_service() {
if [[ $systemd ]]; then if [[ $systemd ]]; then
cp -f ${caddy_tmp}init/linux-systemd/caddy.service /lib/systemd/system/ cp -f ${caddy_tmp}init/linux-systemd/caddy.service /lib/systemd/system/
# sed -i "s/www-data/root/g" /lib/systemd/system/caddy.service # sed -i "s/www-data/root/g" /lib/systemd/system/caddy.service
sed -i "s/on-failure/always/" /lib/systemd/system/caddy.service sed -i "s/on-abnormal/always/" /lib/systemd/system/caddy.service
systemctl enable caddy systemctl enable caddy
else else
cp -f ${caddy_tmp}init/linux-sysvinit/caddy /etc/init.d/caddy cp -f ${caddy_tmp}init/linux-sysvinit/caddy /etc/init.d/caddy

Loading…
Cancel
Save