From 4bd96afe858a8e9af214e5250faf4bdb1c548199 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 4 Dec 2021 23:18:42 +0800 Subject: [PATCH] update-12.04 --- luci-app-bypass/root/etc/init.d/bypass | 10 +++--- .../Makefile | 0 .../luasrc/controller/ddnsto.lua | 0 .../luasrc/model/cbi/ddnsto.lua | 0 .../luasrc/view/admin_status/index/ddnsto.htm | 0 .../luasrc/view/ddnsto_status.htm | 0 .../po/zh-cn/ddnsto.po | 0 luci-app-ddnsto/po/zh_Hans | 1 + .../root/etc/uci-defaults/50_luci-ddnsto | 0 .../Makefile | 0 .../luasrc/controller/linkease.lua | 0 .../luasrc/model/cbi/linkease.lua | 0 .../view/admin_status/index/linkease.htm | 0 .../luasrc/view/linkease_status.htm | 0 .../po/zh-cn/linkease.po | 0 luci-app-linkease/po/zh_Hans | 1 + .../root/etc/uci-defaults/50_luci-linkease | 0 .../luasrc/view/passwall/global/status.htm | 18 +--------- .../luasrc/view/passwall/global/status2.htm | 6 ---- nas-packages-luci/README.md | 34 ------------------- {minisign => openwrt-minisign}/Makefile | 0 {minisign => openwrt-minisign}/README.md | 0 22 files changed, 8 insertions(+), 62 deletions(-) rename {nas-packages-luci/luci/luci-app-ddnsto => luci-app-ddnsto}/Makefile (100%) rename {nas-packages-luci/luci/luci-app-ddnsto => luci-app-ddnsto}/luasrc/controller/ddnsto.lua (100%) rename {nas-packages-luci/luci/luci-app-ddnsto => luci-app-ddnsto}/luasrc/model/cbi/ddnsto.lua (100%) rename {nas-packages-luci/luci/luci-app-ddnsto => luci-app-ddnsto}/luasrc/view/admin_status/index/ddnsto.htm (100%) rename {nas-packages-luci/luci/luci-app-ddnsto => luci-app-ddnsto}/luasrc/view/ddnsto_status.htm (100%) rename {nas-packages-luci/luci/luci-app-ddnsto => luci-app-ddnsto}/po/zh-cn/ddnsto.po (100%) create mode 120000 luci-app-ddnsto/po/zh_Hans rename {nas-packages-luci/luci/luci-app-ddnsto => luci-app-ddnsto}/root/etc/uci-defaults/50_luci-ddnsto (100%) rename {nas-packages-luci/luci/luci-app-linkease => luci-app-linkease}/Makefile (100%) rename {nas-packages-luci/luci/luci-app-linkease => luci-app-linkease}/luasrc/controller/linkease.lua (100%) rename {nas-packages-luci/luci/luci-app-linkease => luci-app-linkease}/luasrc/model/cbi/linkease.lua (100%) rename {nas-packages-luci/luci/luci-app-linkease => luci-app-linkease}/luasrc/view/admin_status/index/linkease.htm (100%) rename {nas-packages-luci/luci/luci-app-linkease => luci-app-linkease}/luasrc/view/linkease_status.htm (100%) rename {nas-packages-luci/luci/luci-app-linkease => luci-app-linkease}/po/zh-cn/linkease.po (100%) create mode 120000 luci-app-linkease/po/zh_Hans rename {nas-packages-luci/luci/luci-app-linkease => luci-app-linkease}/root/etc/uci-defaults/50_luci-linkease (100%) delete mode 100644 nas-packages-luci/README.md rename {minisign => openwrt-minisign}/Makefile (100%) rename {minisign => openwrt-minisign}/README.md (100%) diff --git a/luci-app-bypass/root/etc/init.d/bypass b/luci-app-bypass/root/etc/init.d/bypass index 6cb26c9cc..587d17b81 100755 --- a/luci-app-bypass/root/etc/init.d/bypass +++ b/luci-app-bypass/root/etc/init.d/bypass @@ -976,6 +976,11 @@ gen_serv_include(){ start_server(){ [ $(uci_get_by_type server_global enable_server 0) = 0 ] && return + if [[ "$(uci -q get smartdns.@smartdns[0].enabled)" == "1" ]]; then + uci -q del smartdns.@smartdns[0].enabled + uci commit smartdns + /etc/init.d/smartdns stop 2>/dev/null + fi mkdir -p $VAR config_load $NAME config_foreach run_server server_config @@ -990,11 +995,6 @@ start_monitor(){ } start(){ - if [[ "$(uci -q get smartdns.@smartdns[0].enabled)" == "1" ]]; then - uci -q del smartdns.@smartdns[0].enabled - uci commit smartdns - /etc/init.d/smartdns stop 2>/dev/null - fi touch $LOC if [ -n "$switch_server" ];then GLOBAL_SERVER=$switch_server diff --git a/nas-packages-luci/luci/luci-app-ddnsto/Makefile b/luci-app-ddnsto/Makefile similarity index 100% rename from nas-packages-luci/luci/luci-app-ddnsto/Makefile rename to luci-app-ddnsto/Makefile diff --git a/nas-packages-luci/luci/luci-app-ddnsto/luasrc/controller/ddnsto.lua b/luci-app-ddnsto/luasrc/controller/ddnsto.lua similarity index 100% rename from nas-packages-luci/luci/luci-app-ddnsto/luasrc/controller/ddnsto.lua rename to luci-app-ddnsto/luasrc/controller/ddnsto.lua diff --git a/nas-packages-luci/luci/luci-app-ddnsto/luasrc/model/cbi/ddnsto.lua b/luci-app-ddnsto/luasrc/model/cbi/ddnsto.lua similarity index 100% rename from nas-packages-luci/luci/luci-app-ddnsto/luasrc/model/cbi/ddnsto.lua rename to luci-app-ddnsto/luasrc/model/cbi/ddnsto.lua diff --git a/nas-packages-luci/luci/luci-app-ddnsto/luasrc/view/admin_status/index/ddnsto.htm b/luci-app-ddnsto/luasrc/view/admin_status/index/ddnsto.htm similarity index 100% rename from nas-packages-luci/luci/luci-app-ddnsto/luasrc/view/admin_status/index/ddnsto.htm rename to luci-app-ddnsto/luasrc/view/admin_status/index/ddnsto.htm diff --git a/nas-packages-luci/luci/luci-app-ddnsto/luasrc/view/ddnsto_status.htm b/luci-app-ddnsto/luasrc/view/ddnsto_status.htm similarity index 100% rename from nas-packages-luci/luci/luci-app-ddnsto/luasrc/view/ddnsto_status.htm rename to luci-app-ddnsto/luasrc/view/ddnsto_status.htm diff --git a/nas-packages-luci/luci/luci-app-ddnsto/po/zh-cn/ddnsto.po b/luci-app-ddnsto/po/zh-cn/ddnsto.po similarity index 100% rename from nas-packages-luci/luci/luci-app-ddnsto/po/zh-cn/ddnsto.po rename to luci-app-ddnsto/po/zh-cn/ddnsto.po diff --git a/luci-app-ddnsto/po/zh_Hans b/luci-app-ddnsto/po/zh_Hans new file mode 120000 index 000000000..41451e4a1 --- /dev/null +++ b/luci-app-ddnsto/po/zh_Hans @@ -0,0 +1 @@ +zh-cn \ No newline at end of file diff --git a/nas-packages-luci/luci/luci-app-ddnsto/root/etc/uci-defaults/50_luci-ddnsto b/luci-app-ddnsto/root/etc/uci-defaults/50_luci-ddnsto similarity index 100% rename from nas-packages-luci/luci/luci-app-ddnsto/root/etc/uci-defaults/50_luci-ddnsto rename to luci-app-ddnsto/root/etc/uci-defaults/50_luci-ddnsto diff --git a/nas-packages-luci/luci/luci-app-linkease/Makefile b/luci-app-linkease/Makefile similarity index 100% rename from nas-packages-luci/luci/luci-app-linkease/Makefile rename to luci-app-linkease/Makefile diff --git a/nas-packages-luci/luci/luci-app-linkease/luasrc/controller/linkease.lua b/luci-app-linkease/luasrc/controller/linkease.lua similarity index 100% rename from nas-packages-luci/luci/luci-app-linkease/luasrc/controller/linkease.lua rename to luci-app-linkease/luasrc/controller/linkease.lua diff --git a/nas-packages-luci/luci/luci-app-linkease/luasrc/model/cbi/linkease.lua b/luci-app-linkease/luasrc/model/cbi/linkease.lua similarity index 100% rename from nas-packages-luci/luci/luci-app-linkease/luasrc/model/cbi/linkease.lua rename to luci-app-linkease/luasrc/model/cbi/linkease.lua diff --git a/nas-packages-luci/luci/luci-app-linkease/luasrc/view/admin_status/index/linkease.htm b/luci-app-linkease/luasrc/view/admin_status/index/linkease.htm similarity index 100% rename from nas-packages-luci/luci/luci-app-linkease/luasrc/view/admin_status/index/linkease.htm rename to luci-app-linkease/luasrc/view/admin_status/index/linkease.htm diff --git a/nas-packages-luci/luci/luci-app-linkease/luasrc/view/linkease_status.htm b/luci-app-linkease/luasrc/view/linkease_status.htm similarity index 100% rename from nas-packages-luci/luci/luci-app-linkease/luasrc/view/linkease_status.htm rename to luci-app-linkease/luasrc/view/linkease_status.htm diff --git a/nas-packages-luci/luci/luci-app-linkease/po/zh-cn/linkease.po b/luci-app-linkease/po/zh-cn/linkease.po similarity index 100% rename from nas-packages-luci/luci/luci-app-linkease/po/zh-cn/linkease.po rename to luci-app-linkease/po/zh-cn/linkease.po diff --git a/luci-app-linkease/po/zh_Hans b/luci-app-linkease/po/zh_Hans new file mode 120000 index 000000000..41451e4a1 --- /dev/null +++ b/luci-app-linkease/po/zh_Hans @@ -0,0 +1 @@ +zh-cn \ No newline at end of file diff --git a/nas-packages-luci/luci/luci-app-linkease/root/etc/uci-defaults/50_luci-linkease b/luci-app-linkease/root/etc/uci-defaults/50_luci-linkease similarity index 100% rename from nas-packages-luci/luci/luci-app-linkease/root/etc/uci-defaults/50_luci-linkease rename to luci-app-linkease/root/etc/uci-defaults/50_luci-linkease diff --git a/luci-app-passwall/luasrc/view/passwall/global/status.htm b/luci-app-passwall/luasrc/view/passwall/global/status.htm index 9323ec407..90c5c202d 100644 --- a/luci-app-passwall/luasrc/view/passwall/global/status.htm +++ b/luci-app-passwall/luasrc/view/passwall/global/status.htm @@ -215,19 +215,7 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md <% end %> -
-
-
-
- -
-
-
-

-
-
-
- + diff --git a/luci-app-passwall/luasrc/view/passwall/global/status2.htm b/luci-app-passwall/luasrc/view/passwall/global/status2.htm index 2c978e0a0..abbabff0f 100644 --- a/luci-app-passwall/luasrc/view/passwall/global/status2.htm +++ b/luci-app-passwall/luasrc/view/passwall/global/status2.htm @@ -142,12 +142,6 @@ local status = api.uci_get_type("global_other", "status", "") <% end %> -
- -
-
-
- diff --git a/nas-packages-luci/README.md b/nas-packages-luci/README.md deleted file mode 100644 index d47dc53e2..000000000 --- a/nas-packages-luci/README.md +++ /dev/null @@ -1,34 +0,0 @@ -# nas-packages-luci -luci for [nas-packages](https://github.com/linkease/nas-packages) - -## 使用方法 - -### 增加feed源 - -```shell -echo >> feeds.conf.default -echo 'src-git nas https://github.com/linkease/nas-packages.git;master' >> feeds.conf.default -echo 'src-git nas_luci https://github.com/linkease/nas-packages-luci.git;main' >> feeds.conf.default -./scripts/feeds update nas nas_luci -./scripts/feeds install -a -p nas -./scripts/feeds install -a -p nas_luci -``` - -### 集成软件包 - -```shell -make menuconfig -``` - -选择软件包 -```plain -LuCI ---> -3. Applications ---> -<*> luci-app-ddnsto.................................. LuCI support for ddnsto -<*> luci-app-linkease.................................. LuCI support for linkease -``` - -### 构建固件 -```shell -make -``` \ No newline at end of file diff --git a/minisign/Makefile b/openwrt-minisign/Makefile similarity index 100% rename from minisign/Makefile rename to openwrt-minisign/Makefile diff --git a/minisign/README.md b/openwrt-minisign/README.md similarity index 100% rename from minisign/README.md rename to openwrt-minisign/README.md