From 1c4ae206b84915df4f9834d5bb174956df815ca7 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Fri, 21 Feb 2020 14:30:58 +0800 Subject: [PATCH] target: add zerotier by default --- include/target.mk | 2 +- package/lean/luci-app-ssr-plus/Makefile | 4 ++-- package/lean/luci-app-ssr-plus/po/zh-cn/ssr-plus.po | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/target.mk b/include/target.mk index 2445925e6..f8e176a96 100644 --- a/include/target.mk +++ b/include/target.mk @@ -17,7 +17,7 @@ DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg netifd fs block-mount coremark kmod-nf-nathelper kmod-nf-nathelper-extra kmod-ipt-raw wget libustream-openssl ca-certificates \ default-settings luci luci-proto-relay luci-app-ddns luci-app-sqm luci-app-upnp luci-app-adbyby-plus luci-app-autoreboot \ luci-app-filetransfer luci-app-vsftpd luci-app-ssr-plus luci-app-unblockneteasemusic-mini \ -luci-app-pptp-server luci-app-arpbind luci-app-vlmcsd luci-app-wol luci-app-ramfree \ +luci-app-zerotier luci-app-arpbind luci-app-vlmcsd luci-app-wol luci-app-ramfree \ luci-app-sfe luci-app-flowoffload luci-app-nlbwmon luci-app-accesscontrol \ ddns-scripts_aliyun ddns-scripts_dnspod # For nas targets diff --git a/package/lean/luci-app-ssr-plus/Makefile b/package/lean/luci-app-ssr-plus/Makefile index 0d361b8f0..9d826919f 100644 --- a/package/lean/luci-app-ssr-plus/Makefile +++ b/package/lean/luci-app-ssr-plus/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-ssr-plus -PKG_VERSION:=149 +PKG_VERSION:=150 PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) @@ -38,7 +38,7 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Server config PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Socks bool "Include Socks Sever" - default y + default n endef define Package/$(PKG_NAME) diff --git a/package/lean/luci-app-ssr-plus/po/zh-cn/ssr-plus.po b/package/lean/luci-app-ssr-plus/po/zh-cn/ssr-plus.po index 09a4da7b5..48088fecb 100644 --- a/package/lean/luci-app-ssr-plus/po/zh-cn/ssr-plus.po +++ b/package/lean/luci-app-ssr-plus/po/zh-cn/ssr-plus.po @@ -398,7 +398,7 @@ msgid "Anti-pollution DNS Server" msgstr "访问国外域名DNS服务器" msgid "Custom DNS Server format as IP:PORT (default: 8.8.4.4:53)" -msgstr "自定义国外域名DNS服务器，格式为 IP:PORT (默认: 8.8.4.4:53)。可自定义DNS用于 Netflix 解锁等" +msgstr "自定义国外域名DNS服务器，格式为 IP:PORT (默认: 8.8.4.4:53)" msgid "Use Pdnsd tcp query and cache" msgstr "使用PDNSD TCP查询并缓存"