From c3fe1396ecc8ec4c30b2e909995aae39999296de Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Fri, 22 Mar 2019 19:19:12 +0800 Subject: [PATCH] update config --- config/server/include/ban.json | 9 +++++++++ src/download-caddy.sh | 1 + src/download-v2ray.sh | 1 + 3 files changed, 11 insertions(+) diff --git a/config/server/include/ban.json b/config/server/include/ban.json index 87cf4ea..d596506 100644 --- a/config/server/include/ban.json +++ b/config/server/include/ban.json @@ -9,10 +9,19 @@ "domain:epochtimes.ru", "domain:epochtimes.co.il", "domain:epochtimes.co.kr", + "domain:epochtimes.cz", + "domain:epochtimes.nl", + "domain:epochtimes.it", + "domain:epochtimes.pl", + "domain:epochtimes.com.br", + "domain:epochtimes.se", + "domain:epochtimestr.com", + "domain:epochtimes.com.ua", "domain:epochtimes-romania.com", "domain:erabaru.net", "domain:lagranepoca.com", "domain:theepochtimes.com", + "domain:ntd.com", "domain:ntdtv.com", "domain:ntd.tv", "domain:ntdtv-dc.com", diff --git a/src/download-caddy.sh b/src/download-caddy.sh index ba8a396..3313be0 100644 --- a/src/download-caddy.sh +++ b/src/download-caddy.sh @@ -27,6 +27,7 @@ _install_caddy_service() { if [[ $systemd ]]; then 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 "/on-abnormal/a RestartSec=3" /lib/systemd/system/caddy.service sed -i "s/on-abnormal/always/" /lib/systemd/system/caddy.service systemctl enable caddy else diff --git a/src/download-v2ray.sh b/src/download-v2ray.sh index ac65d9b..2b49b72 100644 --- a/src/download-v2ray.sh +++ b/src/download-v2ray.sh @@ -34,6 +34,7 @@ _download_v2ray_file() { _install_v2ray_service() { if [[ $systemd ]]; then install -m 644 "/usr/bin/v2ray/systemd/v2ray.service" "/lib/systemd/system/" + sed -i '/on-failure/a RestartSec=3' /lib/systemd/system/v2ray.service sed -i "s/on-failure/always/" /lib/systemd/system/v2ray.service systemctl enable v2ray else