From dec8743448e7075a459d481fdb0d86e6562ccd09 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sat, 27 Jul 2019 22:55:47 +0800 Subject: [PATCH] luci-app-pdnsd & luci-app-haproxy-tcp : change section --- package/jsda/luci-app-haproxy-tcp/Makefile | 5 +- package/jsda/luci-app-haproxy-tcp/README.md | 54 --------------------- package/jsda/luci-app-pdnsd/Makefile | 5 +- 3 files changed, 6 insertions(+), 58 deletions(-) delete mode 100755 package/jsda/luci-app-haproxy-tcp/README.md diff --git a/package/jsda/luci-app-haproxy-tcp/Makefile b/package/jsda/luci-app-haproxy-tcp/Makefile index eea63c6a20..de66b69782 100755 --- a/package/jsda/luci-app-haproxy-tcp/Makefile +++ b/package/jsda/luci-app-haproxy-tcp/Makefile @@ -10,8 +10,9 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) include $(INCLUDE_DIR)/package.mk define Package/$(PKG_NAME) - CATEGORY:=Utilities - SUBMENU:=Luci + SECTION:=luci + CATEGORY:=LuCI + SUBMENU:=3. Applications TITLE:=luci for haproxy and shadowsocks PKGARCH:=all DEPENDS:=+haproxy diff --git a/package/jsda/luci-app-haproxy-tcp/README.md b/package/jsda/luci-app-haproxy-tcp/README.md deleted file mode 100755 index d95f46844e..0000000000 --- a/package/jsda/luci-app-haproxy-tcp/README.md +++ /dev/null @@ -1,54 +0,0 @@ -# luci-app-haproxy-tcp -OpenWrt HAProxy的Luci配置页面,已在[该固件][A]中使用 - -简介 ---- - -本软件包为OpenWRT HAPrxoy的 LuCI 控制界面,用于Shadowsocks在多服务器条件下实现负载均衡和高可用 - -可以设置多个主服务器或多个备用服务器. 默认监听端口127.0.0.1:2222 后台监控页面端口0.0.0.0:1111,后台监控页面地址192.168.1.1:1111/haproxy - -多主服务器是将所有TCP流量分流,并可以设置每个服务器的分流比例;多备用服务器是在检测到主服务器A宕机之后切换至备用服务器B,B宕机之后切换到服务器C...依次类推,可以防止因为单个服务器或者线路故障导致的断网问题。 -使用效果和更多使用方法请[点击这里][A] - - -依赖 ---- - -显式依赖 `haproxy`, 安装完毕该luci包后会stop并disable当前op的haproxy,点击“保存&应用”后会修改HAProxy默认配置文件/etc/haproxy.cfg并自动重启,支持开机自启. - - -配置 ---- - -如果有需要,可以修改/etc/haproxy_init.sh ,不要直接修改/etc/haproxy.cfg,否则会被覆盖 - -编译 ---- - -从 OpenWrt 的 [SDK][openwrt-sdk] 编译 -```bash -# 解压下载好的 SDK -tar xjf OpenWrt-SDK-ar71xx-for-linux-x86_64-gcc-4.8-linaro_uClibc-0.9.33.2.tar.bz2 -cd OpenWrt-SDK-ar71xx-* -# Clone 项目 -git clone https://github.com/AlexZhuo/luci-app-haproxy-tcp package/luci-app-haproxy-tcp -# 编译 po2lmo (如果有po2lmo可跳过) -pushd package/luci-app-haproxy-tcp/tools/po2lmo -make && sudo make install -popd -# 选择要编译的包 Utilities -> LuCI -> luci-app-haproxy-tcp -make menuconfig -# 开始编译 -make package/luci-app-haproxy-tcp/compile V=99 -``` - - -截图 ---- -![](https://github.com/AlexZhuo/BreakwallOpenWrt/raw/master/screenshots/haproxy.png) - -[A]: http://www.right.com.cn/forum/thread-198649-1-1.html -[openwrt-sdk]: http://wiki.openwrt.org/doc/howto/obtain.firmware.sdk - - diff --git a/package/jsda/luci-app-pdnsd/Makefile b/package/jsda/luci-app-pdnsd/Makefile index 3d4992047e..7793c719ee 100755 --- a/package/jsda/luci-app-pdnsd/Makefile +++ b/package/jsda/luci-app-pdnsd/Makefile @@ -10,8 +10,9 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) include $(INCLUDE_DIR)/package.mk define Package/$(PKG_NAME) - CATEGORY:=Utilities - SUBMENU:=Luci + SECTION:=luci + CATEGORY:=LuCI + SUBMENU:=3. Applications PKGARCH:=all TITLE:=luci for pdnsd to invoid DNS pollution DEPENDS:=+pdnsd-alt