diff --git a/package/ctcgfw/luci-app-adguardhome/po/zh-cn/AdGuardHome.po b/package/ctcgfw/luci-app-adguardhome/po/zh_Hans/AdGuardHome.po similarity index 100% rename from package/ctcgfw/luci-app-adguardhome/po/zh-cn/AdGuardHome.po rename to package/ctcgfw/luci-app-adguardhome/po/zh_Hans/AdGuardHome.po diff --git a/package/ctcgfw/luci-app-appfilter/po/zh-cn/oaf.po b/package/ctcgfw/luci-app-appfilter/po/zh_Hans/oaf.po similarity index 100% rename from package/ctcgfw/luci-app-appfilter/po/zh-cn/oaf.po rename to package/ctcgfw/luci-app-appfilter/po/zh_Hans/oaf.po diff --git a/package/ctcgfw/luci-app-diskman/po/zh-cn/diskman.po b/package/ctcgfw/luci-app-diskman/po/zh_Hans/diskman.po similarity index 100% rename from package/ctcgfw/luci-app-diskman/po/zh-cn/diskman.po rename to package/ctcgfw/luci-app-diskman/po/zh_Hans/diskman.po diff --git a/package/ctcgfw/luci-app-dockerman/po/zh-cn/dockerman.po b/package/ctcgfw/luci-app-dockerman/po/zh_Hans/dockerman.po similarity index 100% rename from package/ctcgfw/luci-app-dockerman/po/zh-cn/dockerman.po rename to package/ctcgfw/luci-app-dockerman/po/zh_Hans/dockerman.po diff --git a/package/ctcgfw/luci-app-iptvhelper/po/zh-cn/iptvhelper.po b/package/ctcgfw/luci-app-iptvhelper/po/zh_Hans/iptvhelper.po similarity index 100% rename from package/ctcgfw/luci-app-iptvhelper/po/zh-cn/iptvhelper.po rename to package/ctcgfw/luci-app-iptvhelper/po/zh_Hans/iptvhelper.po diff --git a/package/ctcgfw/luci-app-onliner/po/zh-cn/onliner.po b/package/ctcgfw/luci-app-onliner/po/zh_Hans/onliner.po similarity index 100% rename from package/ctcgfw/luci-app-onliner/po/zh-cn/onliner.po rename to package/ctcgfw/luci-app-onliner/po/zh_Hans/onliner.po diff --git a/package/ctcgfw/luci-app-openclash/i18n/zh-cn/openclash.zh-cn.po b/package/ctcgfw/luci-app-openclash/i18n/zh_Hans/openclash.zh-cn.po similarity index 99% rename from package/ctcgfw/luci-app-openclash/i18n/zh-cn/openclash.zh-cn.po rename to package/ctcgfw/luci-app-openclash/i18n/zh_Hans/openclash.zh-cn.po index cd41999eba..f3a5513a78 100644 --- a/package/ctcgfw/luci-app-openclash/i18n/zh-cn/openclash.zh-cn.po +++ b/package/ctcgfw/luci-app-openclash/i18n/zh_Hans/openclash.zh-cn.po @@ -1,6 +1,6 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: zh_CN\n" +"Language: zh_Hans\n" msgid "OpenClash" msgstr "OpenClash" diff --git a/package/ctcgfw/luci-app-rclone/po/zh-cn/rclone.po b/package/ctcgfw/luci-app-rclone/po/zh_Hans/rclone.po similarity index 99% rename from package/ctcgfw/luci-app-rclone/po/zh-cn/rclone.po rename to package/ctcgfw/luci-app-rclone/po/zh_Hans/rclone.po index 0d673325cc..0ddd62530c 100644 --- a/package/ctcgfw/luci-app-rclone/po/zh-cn/rclone.po +++ b/package/ctcgfw/luci-app-rclone/po/zh_Hans/rclone.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: \n" "Last-Translator: ElonH \n" "Language-Team: none\n" -"Language: zh_CN\n" +"Language: zh_Hans\n" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" "POT-Creation-Date: \n" diff --git a/package/ctcgfw/luci-app-smartinfo/po/zh-cn/smartinfo.po b/package/ctcgfw/luci-app-smartinfo/po/zh_Hans/smartinfo.po similarity index 100% rename from package/ctcgfw/luci-app-smartinfo/po/zh-cn/smartinfo.po rename to package/ctcgfw/luci-app-smartinfo/po/zh_Hans/smartinfo.po diff --git a/package/ctcgfw/luci-app-ssocks/po/zh-cn/ssocks.po b/package/ctcgfw/luci-app-ssocks/po/zh_Hans/ssocks.po similarity index 100% rename from package/ctcgfw/luci-app-ssocks/po/zh-cn/ssocks.po rename to package/ctcgfw/luci-app-ssocks/po/zh_Hans/ssocks.po diff --git a/package/ctcgfw/luci-app-vssr/po/zh-cn/vssr.po b/package/ctcgfw/luci-app-vssr/po/zh_Hans/vssr.po similarity index 100% rename from package/ctcgfw/luci-app-vssr/po/zh-cn/vssr.po rename to package/ctcgfw/luci-app-vssr/po/zh_Hans/vssr.po diff --git a/package/jsda/luci-app-advancedsetting/po/zh-cn/advancedsetting.po b/package/jsda/luci-app-advancedsetting/po/zh_Hans/advancedsetting.po similarity index 100% rename from package/jsda/luci-app-advancedsetting/po/zh-cn/advancedsetting.po rename to package/jsda/luci-app-advancedsetting/po/zh_Hans/advancedsetting.po diff --git a/package/jsda/luci-app-cifs/po/zh-cn/cifs.po b/package/jsda/luci-app-cifs/po/zh_Hans/cifs.po similarity index 100% rename from package/jsda/luci-app-cifs/po/zh-cn/cifs.po rename to package/jsda/luci-app-cifs/po/zh_Hans/cifs.po diff --git a/package/jsda/luci-app-clash/po/zh-cn/clash.po b/package/jsda/luci-app-clash/po/zh_Hans/clash.po similarity index 100% rename from package/jsda/luci-app-clash/po/zh-cn/clash.po rename to package/jsda/luci-app-clash/po/zh_Hans/clash.po diff --git a/package/jsda/luci-app-cpulimit/po/zh-cn/cpulimit.po b/package/jsda/luci-app-cpulimit/po/zh_Hans/cpulimit.po similarity index 97% rename from package/jsda/luci-app-cpulimit/po/zh-cn/cpulimit.po rename to package/jsda/luci-app-cpulimit/po/zh_Hans/cpulimit.po index 7495022ea9..697addf948 100644 --- a/package/jsda/luci-app-cpulimit/po/zh-cn/cpulimit.po +++ b/package/jsda/luci-app-cpulimit/po/zh_Hans/cpulimit.po @@ -5,7 +5,7 @@ msgstr "" "POT-Creation-Date: 2014-06-28\n" "PO-Revision-Date: 2014-06-28\n" "Last-Translator: Syrone Wong \n" -"Language: zh_CN\n" +"Language: zh_Hans\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/package/jsda/luci-app-eqos/files/po/zh-cn/eqos.po b/package/jsda/luci-app-eqos/files/po/zh_Hans/eqos.po similarity index 97% rename from package/jsda/luci-app-eqos/files/po/zh-cn/eqos.po rename to package/jsda/luci-app-eqos/files/po/zh_Hans/eqos.po index 80eff58572..7cd12c7323 100644 --- a/package/jsda/luci-app-eqos/files/po/zh-cn/eqos.po +++ b/package/jsda/luci-app-eqos/files/po/zh_Hans/eqos.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: LuCi Chinese Translation\n" "Report-Msgid-Bugs-To: \n" -"Language: zh_CN\n" +"Language: zh_Hans\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/package/jsda/luci-app-kcptun/po/zh-cn/kcptun.po b/package/jsda/luci-app-kcptun/po/zh_Hans/kcptun.po similarity index 100% rename from package/jsda/luci-app-kcptun/po/zh-cn/kcptun.po rename to package/jsda/luci-app-kcptun/po/zh_Hans/kcptun.po diff --git a/package/jsda/luci-app-netdata/po/zh-cn/netdata.po b/package/jsda/luci-app-netdata/po/zh_Hans/netdata.po similarity index 100% rename from package/jsda/luci-app-netdata/po/zh-cn/netdata.po rename to package/jsda/luci-app-netdata/po/zh_Hans/netdata.po diff --git a/package/jsda/luci-app-nfs/files/luci/i18n/nfs.zh-cn.po b/package/jsda/luci-app-nfs/files/luci/i18n/nfs.zh-cn.po index 14ef1466e9..c598fa2cee 100644 --- a/package/jsda/luci-app-nfs/files/luci/i18n/nfs.zh-cn.po +++ b/package/jsda/luci-app-nfs/files/luci/i18n/nfs.zh-cn.po @@ -5,7 +5,7 @@ msgstr "" "POT-Creation-Date: 2016-03-1\n" "PO-Revision-Date: 2016-03-1 21:36+0800\n" "Last-Translator: leenchan\n" -"Language: zh_CN\n" +"Language: zh_Hans\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/package/jsda/luci-app-ngrokc/i18n/zh-cn/ngrokc.zh-cn.po b/package/jsda/luci-app-ngrokc/i18n/zh_Hans/ngrokc.zh-cn.po similarity index 100% rename from package/jsda/luci-app-ngrokc/i18n/zh-cn/ngrokc.zh-cn.po rename to package/jsda/luci-app-ngrokc/i18n/zh_Hans/ngrokc.zh-cn.po diff --git a/package/jsda/luci-app-oscam/po/zh-cn/oscam.po b/package/jsda/luci-app-oscam/po/zh_Hans/oscam.po similarity index 100% rename from package/jsda/luci-app-oscam/po/zh-cn/oscam.po rename to package/jsda/luci-app-oscam/po/zh_Hans/oscam.po diff --git a/package/jsda/luci-app-shadowsocksr-alex/i18n/zh-cn/shadowsocksR.zh-cn.po b/package/jsda/luci-app-shadowsocksr-alex/i18n/zh_Hans/shadowsocksR.zh-cn.po similarity index 100% rename from package/jsda/luci-app-shadowsocksr-alex/i18n/zh-cn/shadowsocksR.zh-cn.po rename to package/jsda/luci-app-shadowsocksr-alex/i18n/zh_Hans/shadowsocksR.zh-cn.po diff --git a/package/jsda/luci-app-smartdns/po/zh-cn/smartdns.po b/package/jsda/luci-app-smartdns/po/zh_Hans/smartdns.po similarity index 100% rename from package/jsda/luci-app-smartdns/po/zh-cn/smartdns.po rename to package/jsda/luci-app-smartdns/po/zh_Hans/smartdns.po diff --git a/package/jsda/luci-app-softethervpn5/po/zh-cn/softethervpn5.po b/package/jsda/luci-app-softethervpn5/po/zh_Hans/softethervpn5.po similarity index 100% rename from package/jsda/luci-app-softethervpn5/po/zh-cn/softethervpn5.po rename to package/jsda/luci-app-softethervpn5/po/zh_Hans/softethervpn5.po diff --git a/package/jsda/luci-app-terminal/po/zh-cn/terminal.po b/package/jsda/luci-app-terminal/po/zh_Hans/terminal.po similarity index 100% rename from package/jsda/luci-app-terminal/po/zh-cn/terminal.po rename to package/jsda/luci-app-terminal/po/zh_Hans/terminal.po diff --git a/package/lean/luci-app-accesscontrol/po/zh-cn/mia.po b/package/lean/luci-app-accesscontrol/po/zh_Hans/mia.po similarity index 100% rename from package/lean/luci-app-accesscontrol/po/zh-cn/mia.po rename to package/lean/luci-app-accesscontrol/po/zh_Hans/mia.po diff --git a/package/lean/luci-app-adbyby-plus/po/zh-cn/adbyby.po b/package/lean/luci-app-adbyby-plus/po/zh_Hans/adbyby.po similarity index 100% rename from package/lean/luci-app-adbyby-plus/po/zh-cn/adbyby.po rename to package/lean/luci-app-adbyby-plus/po/zh_Hans/adbyby.po diff --git a/package/lean/luci-app-amule/po/zh-cn/amule.po b/package/lean/luci-app-amule/po/zh_Hans/amule.po similarity index 100% rename from package/lean/luci-app-amule/po/zh-cn/amule.po rename to package/lean/luci-app-amule/po/zh_Hans/amule.po diff --git a/package/lean/luci-app-arpbind/po/zh-cn/arpbind.po b/package/lean/luci-app-arpbind/po/zh_Hans/arpbind.po similarity index 97% rename from package/lean/luci-app-arpbind/po/zh-cn/arpbind.po rename to package/lean/luci-app-arpbind/po/zh_Hans/arpbind.po index 278f069ee0..4e3b7756fa 100644 --- a/package/lean/luci-app-arpbind/po/zh-cn/arpbind.po +++ b/package/lean/luci-app-arpbind/po/zh_Hans/arpbind.po @@ -6,7 +6,7 @@ msgstr "" "PO-Revision-Date: 2015-06-23 20:17+0800\n" "Last-Translator: 981213 \n" "Language-Team: PandoraBox Team\n" -"Language: zh_CN\n" +"Language: zh_Hans\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/package/lean/luci-app-autoreboot/po/zh-cn/autoreboot.po b/package/lean/luci-app-autoreboot/po/zh_Hans/autoreboot.po similarity index 100% rename from package/lean/luci-app-autoreboot/po/zh-cn/autoreboot.po rename to package/lean/luci-app-autoreboot/po/zh_Hans/autoreboot.po diff --git a/package/lean/luci-app-dnsforwarder/po/zh-cn/dnsforwarder.zh-cn.po b/package/lean/luci-app-dnsforwarder/po/zh_Hans/dnsforwarder.zh-cn.po similarity index 100% rename from package/lean/luci-app-dnsforwarder/po/zh-cn/dnsforwarder.zh-cn.po rename to package/lean/luci-app-dnsforwarder/po/zh_Hans/dnsforwarder.zh-cn.po diff --git a/package/lean/luci-app-docker/po/zh-cn/docker.po b/package/lean/luci-app-docker/po/zh_Hans/docker.po similarity index 98% rename from package/lean/luci-app-docker/po/zh-cn/docker.po rename to package/lean/luci-app-docker/po/zh_Hans/docker.po index b95369aacf..c687f23dc0 100644 --- a/package/lean/luci-app-docker/po/zh-cn/docker.po +++ b/package/lean/luci-app-docker/po/zh_Hans/docker.po @@ -6,7 +6,7 @@ msgstr "" "PO-Revision-Date: 2015-06-23 20:17+0800\n" "Last-Translator: coolsnowwolf \n" "Language-Team: PandoraBox Team\n" -"Language: zh_CN\n" +"Language: zh_Hans\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/package/lean/luci-app-filetransfer/po/zh-cn/filetransfer.po b/package/lean/luci-app-filetransfer/po/zh_Hans/filetransfer.po similarity index 100% rename from package/lean/luci-app-filetransfer/po/zh-cn/filetransfer.po rename to package/lean/luci-app-filetransfer/po/zh_Hans/filetransfer.po diff --git a/package/lean/luci-app-flowoffload/po/zh-cn/flowoffload.po b/package/lean/luci-app-flowoffload/po/zh_Hans/flowoffload.po similarity index 100% rename from package/lean/luci-app-flowoffload/po/zh-cn/flowoffload.po rename to package/lean/luci-app-flowoffload/po/zh_Hans/flowoffload.po diff --git a/package/lean/luci-app-guest-wifi/po/zh-cn/guest-wifi.po b/package/lean/luci-app-guest-wifi/po/zh_Hans/guest-wifi.po similarity index 100% rename from package/lean/luci-app-guest-wifi/po/zh-cn/guest-wifi.po rename to package/lean/luci-app-guest-wifi/po/zh_Hans/guest-wifi.po diff --git a/package/lean/luci-app-haproxy-tcp/po/zh-cn/haproxy-tcp.po b/package/lean/luci-app-haproxy-tcp/po/zh_Hans/haproxy-tcp.po similarity index 100% rename from package/lean/luci-app-haproxy-tcp/po/zh-cn/haproxy-tcp.po rename to package/lean/luci-app-haproxy-tcp/po/zh_Hans/haproxy-tcp.po diff --git a/package/lean/luci-app-ipsec-vpnd/po/zh-cn/ipsec.po b/package/lean/luci-app-ipsec-vpnd/po/zh_Hans/ipsec.po similarity index 100% rename from package/lean/luci-app-ipsec-vpnd/po/zh-cn/ipsec.po rename to package/lean/luci-app-ipsec-vpnd/po/zh_Hans/ipsec.po diff --git a/package/lean/luci-app-mwan3helper/po/zh-cn/mwan3helper.po b/package/lean/luci-app-mwan3helper/po/zh_Hans/mwan3helper.po similarity index 96% rename from package/lean/luci-app-mwan3helper/po/zh-cn/mwan3helper.po rename to package/lean/luci-app-mwan3helper/po/zh_Hans/mwan3helper.po index ff41800367..ed36fb5c9f 100644 --- a/package/lean/luci-app-mwan3helper/po/zh-cn/mwan3helper.po +++ b/package/lean/luci-app-mwan3helper/po/zh_Hans/mwan3helper.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"Language: zh_CN\n" +"Language: zh_Hans\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/package/lean/luci-app-n2n_v2/po/zh-cn/n2n_v2.po b/package/lean/luci-app-n2n_v2/po/zh_Hans/n2n_v2.po similarity index 98% rename from package/lean/luci-app-n2n_v2/po/zh-cn/n2n_v2.po rename to package/lean/luci-app-n2n_v2/po/zh_Hans/n2n_v2.po index beedc04ae1..b1c78e61b5 100644 --- a/package/lean/luci-app-n2n_v2/po/zh-cn/n2n_v2.po +++ b/package/lean/luci-app-n2n_v2/po/zh_Hans/n2n_v2.po @@ -5,7 +5,7 @@ msgstr "" "POT-Creation-Date: 2014-10-01\n" "PO-Revision-Date: 2014-10-01\n" "Last-Translator: 981213 \n" -"Language: zh_CN\n" +"Language: zh_Hans\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/package/lean/luci-app-nft-qos/po/zh-cn/nft-qos.po b/package/lean/luci-app-nft-qos/po/zh_Hans/nft-qos.po similarity index 99% rename from package/lean/luci-app-nft-qos/po/zh-cn/nft-qos.po rename to package/lean/luci-app-nft-qos/po/zh_Hans/nft-qos.po index 73ce11f5d0..70bcfaa2c9 100644 --- a/package/lean/luci-app-nft-qos/po/zh-cn/nft-qos.po +++ b/package/lean/luci-app-nft-qos/po/zh_Hans/nft-qos.po @@ -13,7 +13,7 @@ msgstr "" "X-Generator: Gtranslator 3.30.1\n" "Last-Translator: Yangfl \n" "Plural-Forms: nplurals=1; plural=0;\n" -"Language: zh_CN\n" +"Language: zh_Hans\n" #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:136 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:155 diff --git a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/Makefile b/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/Makefile deleted file mode 100644 index 4e51de6440..0000000000 --- a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (C) 2016 Openwrt.org -# -# This is free software, licensed under the Apache License, Version 2.0 . -# - -include $(TOPDIR)/rules.mk - -LUCI_TITLE:=LuCI support for OpenVPN Server -LUCI_DEPENDS:=+openvpn-openssl +openvpn-easy-rsa +kmod-tun -LUCI_PKGARCH:=all -PKG_NAME:=luci-app-openvpn-server -PKG_VERSION:=2.0 -PKG_RELEASE:=18 - -include $(TOPDIR)/feeds/luci/luci.mk - -# call BuildPackage - OpenWrt buildroot signature - - - - diff --git a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/luasrc/controller/openvpn-server.lua b/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/luasrc/controller/openvpn-server.lua deleted file mode 100644 index 3d05765f3f..0000000000 --- a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/luasrc/controller/openvpn-server.lua +++ /dev/null @@ -1,22 +0,0 @@ - -module("luci.controller.openvpn-server", package.seeall) - -function index() - if not nixio.fs.access("/etc/config/openvpn") then - return - end - - entry({"admin", "vpn"}, firstchild(), "VPN", 45).dependent = false - - local page - - entry({"admin", "vpn", "openvpn-server"}, cbi("openvpn-server/openvpn-server"), _("OpenVPN Server"), 80).dependent=false - entry({"admin", "vpn", "openvpn-server","status"},call("act_status")).leaf=true -end - -function act_status() - local e={} - e.running=luci.sys.call("pgrep openvpn >/dev/null")==0 - luci.http.prepare_content("application/json") - luci.http.write_json(e) -end \ No newline at end of file diff --git a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/luasrc/model/cbi/openvpn-server/openvpn-server.lua b/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/luasrc/model/cbi/openvpn-server/openvpn-server.lua deleted file mode 100644 index 183a85ae42..0000000000 --- a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/luasrc/model/cbi/openvpn-server/openvpn-server.lua +++ /dev/null @@ -1,103 +0,0 @@ - ---require("luci.tools.webadmin") - -mp = Map("openvpn", "OpenVPN Server",translate("An easy config OpenVPN Server Web-UI")) - -mp:section(SimpleSection).template = "openvpn/openvpn_status" - -s = mp:section(TypedSection, "openvpn") -s.anonymous = true -s.addremove = false - -s:tab("basic", translate("Base Setting")) - -o = s:taboption("basic", Flag, "enabled", translate("Enable")) - -proto = s:taboption("basic",Value,"proto", translate("Proto")) -proto:value("tcp", translate("TCP Server")) -proto:value("udp", translate("UDP Server")) - -port = s:taboption("basic", Value, "port", translate("Port")) -port.datatype = "range(1,65535)" - -ddns = s:taboption("basic", Value, "ddns", translate("WAN DDNS or IP")) -ddns.datatype = "string" -ddns.default = "exmple.com" -ddns.rmempty = false - -localnet = s:taboption("basic", Value, "server", translate("Client Network")) -localnet.datatype = "string" -localnet.description = translate("VPN Client Network IP with subnet") - -list = s:taboption("basic", DynamicList, "push") -list.title = translate("Client Settings") -list.datatype = "string" -list.description = translate("Set route 192.168.0.0 255.255.255.0 and dhcp-option DNS 192.168.0.1 base on your router") - - -local o -o = s:taboption("basic", Button,"certificate",translate("OpenVPN Client config file")) -o.inputtitle = translate("Download .ovpn file") -o.description = translate("If you are using IOS client, please download this .ovpn file and send it via QQ or Email to your IOS device") -o.inputstyle = "reload" -o.write = function() - luci.sys.call("sh /etc/genovpn.sh 2>&1 >/dev/null") - Download() -end - -s:tab("code", translate("Special Code")) - -local conf = "/etc/ovpnadd.conf" -local NXFS = require "nixio.fs" -o = s:taboption("code", TextValue, "conf") -o.description = translate("(!)Special Code you know that add in to client .ovpn file") -o.rows = 13 -o.wrap = "off" -o.cfgvalue = function(self, section) - return NXFS.readfile(conf) or "" -end -o.write = function(self, section, value) - NXFS.writefile(conf, value:gsub("\r\n", "\n")) -end - - -local pid = luci.util.exec("/usr/bin/pgrep openvpn") - -function openvpn_process_status() - local status = "OpenVPN is not running now " - - if pid ~= "" then - status = "OpenVPN is running with the PID " .. pid .. "" - end - - local status = { status=status } - local table = { pid=status } - return table -end - - - -function Download() - local t,e - t=nixio.open("/tmp/my.ovpn","r") - luci.http.header('Content-Disposition','attachment; filename="my.ovpn"') - luci.http.prepare_content("application/octet-stream") - while true do - e=t:read(nixio.const.buffersize) - if(not e)or(#e==0)then - break - else - luci.http.write(e) - end - end - t:close() - luci.http.close() -end - -function mp.on_after_commit(self) - os.execute("uci set firewall.openvpn.dest_port=$(uci get openvpn.myvpn.port) && uci commit firewall && /etc/init.d/firewall restart") - os.execute("/etc/init.d/openvpn restart") -end - - -return mp diff --git a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/luasrc/view/openvpn/openvpn_status.htm b/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/luasrc/view/openvpn/openvpn_status.htm deleted file mode 100644 index 752abd4d0b..0000000000 --- a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/luasrc/view/openvpn/openvpn_status.htm +++ /dev/null @@ -1,22 +0,0 @@ - - -
-

- <%:Collecting data...%> -

-
\ No newline at end of file diff --git a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/config/openvpn b/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/config/openvpn deleted file mode 100644 index 6a829f4e60..0000000000 --- a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/config/openvpn +++ /dev/null @@ -1,28 +0,0 @@ - -config openvpn 'myvpn' - option enabled '0' - option proto 'tcp-server' - option port '1194' - option ddns example.com - option dev 'tun' - option topology 'subnet' - option server '10.8.0.0 255.255.255.0' - option comp_lzo 'adaptive' - option ca '/etc/openvpn/ca.crt' - option dh '/etc/openvpn/dh1024.pem' - option cert '/etc/openvpn/server.crt' - option key '/etc/openvpn/server.key' - option persist_key '1' - option persist_tun '1' - option user 'nobody' - option group 'nogroup' - option max_clients '10' - option keepalive '10 120' - option verb '3' - option status '/var/log/openvpn_status.log' - option log '/tmp/openvpn.log' - list push 'route 192.168.0.0 255.255.255.0' - list push 'comp-lzo adaptive' - list push 'redirect-gateway def1 bypass-dhcp' - list push 'dhcp-option DNS 192.168.0.1' - diff --git a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/01.pem b/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/01.pem deleted file mode 100755 index a73a757e94..0000000000 --- a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/01.pem +++ /dev/null @@ -1,74 +0,0 @@ -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 1 (0x1) - Signature Algorithm: sha256WithRSAEncryption - Issuer: C=CN, ST=ZJ, L=ZJ, O=ZJ, OU=ZJ, CN=ZJ CA/name=EasyRSA/emailAddress=ZJ@ZJ.com - Validity - Not Before: Aug 23 14:26:42 2017 GMT - Not After : Aug 21 14:26:42 2027 GMT - Subject: C=CN, ST=ZJ, L=ZJ, O=ZJ, OU=ZJ, CN=server/name=EasyRSA/emailAddress=ZJ@ZJ.com - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - Public-Key: (1024 bit) - Modulus: - 00:e0:67:2e:33:ab:4f:4f:a1:78:c6:32:ba:d3:1d: - 71:73:34:ba:45:40:88:87:76:03:fb:87:d8:4e:4e: - 7c:7d:95:22:7d:8e:70:dc:68:10:27:fe:7d:f0:79: - 93:86:83:ef:a9:16:78:ae:86:5e:ea:42:74:38:4d: - 37:0d:c9:34:a6:84:5e:64:ad:dd:91:dd:df:02:bf: - 53:f8:fb:c0:9b:cb:bd:93:7c:26:ab:bd:0a:c6:c3: - 5d:da:5d:b3:c0:ff:72:a1:2f:1e:0b:f6:a6:71:77: - f9:00:38:8a:ae:ab:c0:86:11:ab:12:de:1e:82:13: - e8:c3:d5:bb:6f:2e:bf:6e:c1 - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Basic Constraints: - CA:FALSE - Netscape Cert Type: - SSL Server - Netscape Comment: - Easy-RSA Generated Server Certificate - X509v3 Subject Key Identifier: - 1C:06:47:33:61:0E:15:84:D5:08:5A:40:E6:C9:23:EF:87:F3:EE:F9 - X509v3 Authority Key Identifier: - keyid:8D:D5:04:79:10:05:4F:1B:12:63:11:AC:00:D4:FC:CC:31:00:B8:09 - DirName:/C=CN/ST=ZJ/L=ZJ/O=ZJ/OU=ZJ/CN=ZJ CA/name=EasyRSA/emailAddress=ZJ@ZJ.com - serial:AE:18:A1:E1:3D:52:4D:F0 - - X509v3 Extended Key Usage: - TLS Web Server Authentication - X509v3 Key Usage: - Digital Signature, Key Encipherment - Signature Algorithm: sha256WithRSAEncryption - aa:b5:0d:7a:b3:09:7a:d4:e6:df:46:0d:54:39:e2:34:da:4f: - 9b:92:d6:41:db:10:b9:ed:66:34:7f:9d:a9:fa:af:6a:80:b4: - 1f:13:d3:39:a6:72:93:5a:6b:e8:4f:ba:95:f9:83:10:58:b3: - fe:12:3f:a9:e8:31:04:e0:8e:d8:4c:c1:f7:7e:fc:7a:ba:17: - d8:2e:76:ab:7c:17:ca:a4:1d:3d:c5:bc:df:02:e5:2e:91:c4: - b2:6c:40:a1:e2:3d:64:15:da:a6:b0:e4:1d:66:11:54:c0:49: - 05:91:c4:69:68:2d:bc:d5:f6:32:43:3c:18:c4:97:54:45:52: - 28:36 ------BEGIN CERTIFICATE----- -MIIDvzCCAyigAwIBAgIBATANBgkqhkiG9w0BAQsFADB9MQswCQYDVQQGEwJDTjEL -MAkGA1UECBMCWkoxCzAJBgNVBAcTAlpKMQswCQYDVQQKEwJaSjELMAkGA1UECxMC -WkoxDjAMBgNVBAMTBVpKIENBMRAwDgYDVQQpEwdFYXN5UlNBMRgwFgYJKoZIhvcN -AQkBFglaSkBaSi5jb20wHhcNMTcwODIzMTQyNjQyWhcNMjcwODIxMTQyNjQyWjB+ -MQswCQYDVQQGEwJDTjELMAkGA1UECBMCWkoxCzAJBgNVBAcTAlpKMQswCQYDVQQK -EwJaSjELMAkGA1UECxMCWkoxDzANBgNVBAMTBnNlcnZlcjEQMA4GA1UEKRMHRWFz -eVJTQTEYMBYGCSqGSIb3DQEJARYJWkpAWkouY29tMIGfMA0GCSqGSIb3DQEBAQUA -A4GNADCBiQKBgQDgZy4zq09PoXjGMrrTHXFzNLpFQIiHdgP7h9hOTnx9lSJ9jnDc -aBAn/n3weZOGg++pFniuhl7qQnQ4TTcNyTSmhF5krd2R3d8Cv1P4+8Cby72TfCar -vQrGw13aXbPA/3KhLx4L9qZxd/kAOIquq8CGEasS3h6CE+jD1btvLr9uwQIDAQAB -o4IBTDCCAUgwCQYDVR0TBAIwADARBglghkgBhvhCAQEEBAMCBkAwNAYJYIZIAYb4 -QgENBCcWJUVhc3ktUlNBIEdlbmVyYXRlZCBTZXJ2ZXIgQ2VydGlmaWNhdGUwHQYD -VR0OBBYEFBwGRzNhDhWE1QhaQObJI++H8+75MIGwBgNVHSMEgagwgaWAFI3VBHkQ -BU8bEmMRrADU/MwxALgJoYGBpH8wfTELMAkGA1UEBhMCQ04xCzAJBgNVBAgTAlpK -MQswCQYDVQQHEwJaSjELMAkGA1UEChMCWkoxCzAJBgNVBAsTAlpKMQ4wDAYDVQQD -EwVaSiBDQTEQMA4GA1UEKRMHRWFzeVJTQTEYMBYGCSqGSIb3DQEJARYJWkpAWkou -Y29tggkArhih4T1STfAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwCwYDVR0PBAQDAgWg -MA0GCSqGSIb3DQEBCwUAA4GBAKq1DXqzCXrU5t9GDVQ54jTaT5uS1kHbELntZjR/ -nan6r2qAtB8T0zmmcpNaa+hPupX5gxBYs/4SP6noMQTgjthMwfd+/Hq6F9gudqt8 -F8qkHT3FvN8C5S6RxLJsQKHiPWQV2qaw5B1mEVTASQWRxGloLbzV9jJDPBjEl1RF -Uig2 ------END CERTIFICATE----- diff --git a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/02.pem b/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/02.pem deleted file mode 100755 index c757880eaa..0000000000 --- a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/02.pem +++ /dev/null @@ -1,71 +0,0 @@ -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 2 (0x2) - Signature Algorithm: sha256WithRSAEncryption - Issuer: C=CN, ST=ZJ, L=ZJ, O=ZJ, OU=ZJ, CN=ZJ CA/name=EasyRSA/emailAddress=ZJ@ZJ.com - Validity - Not Before: Aug 23 14:26:58 2017 GMT - Not After : Aug 21 14:26:58 2027 GMT - Subject: C=CN, ST=ZJ, L=ZJ, O=ZJ, OU=ZJ, CN=client1/name=EasyRSA/emailAddress=ZJ@ZJ.com - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - Public-Key: (1024 bit) - Modulus: - 00:b7:6b:40:0b:c1:ef:a7:c3:fa:54:32:c2:d7:87: - fa:ac:85:18:ae:af:44:ba:dd:57:0f:43:73:eb:df: - 37:5e:5e:8f:ad:43:7a:87:dd:a6:bd:6a:0b:68:8d: - 75:0c:fe:49:39:e1:54:11:53:0f:b5:63:10:5b:21: - 98:7f:53:32:b3:d6:b0:3d:23:fc:1d:ad:06:b0:f0: - fb:10:27:83:e1:5e:5a:b4:f6:7c:02:87:4c:73:86: - 7b:79:07:ca:a7:1c:18:2c:70:e3:9d:e6:f0:89:06: - 4b:25:2c:09:39:51:c3:d4:44:ef:81:5e:aa:e0:63: - d8:11:c6:9c:e0:6f:d8:66:11 - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Basic Constraints: - CA:FALSE - Netscape Comment: - Easy-RSA Generated Certificate - X509v3 Subject Key Identifier: - E8:15:F9:71:C4:A7:C2:41:A3:AF:F5:C5:93:51:8E:5D:67:9B:12:E2 - X509v3 Authority Key Identifier: - keyid:8D:D5:04:79:10:05:4F:1B:12:63:11:AC:00:D4:FC:CC:31:00:B8:09 - DirName:/C=CN/ST=ZJ/L=ZJ/O=ZJ/OU=ZJ/CN=ZJ CA/name=EasyRSA/emailAddress=ZJ@ZJ.com - serial:AE:18:A1:E1:3D:52:4D:F0 - - X509v3 Extended Key Usage: - TLS Web Client Authentication - X509v3 Key Usage: - Digital Signature - Signature Algorithm: sha256WithRSAEncryption - 5b:63:c2:e5:e4:04:ad:f4:b6:76:24:df:94:a5:b0:a2:99:38: - f9:e7:b4:2f:79:91:51:1b:06:4b:33:fc:4c:74:ce:47:3e:54: - 1b:da:ea:43:e3:6d:6e:ec:b4:cd:77:86:ea:ea:48:a1:79:70: - 5c:ff:99:0e:fb:bd:fc:0d:89:a6:2e:13:fe:86:82:69:33:4c: - 28:21:0d:a8:ba:1a:3e:c7:2e:2d:97:0c:5a:ed:e3:af:73:fc: - bb:c9:58:05:c5:26:56:13:1c:3e:8f:90:c7:e8:d9:e5:0b:1f: - 40:9a:fa:15:49:b9:d8:8e:6a:fd:71:f4:3c:df:a1:11:af:fb: - ea:a8 ------BEGIN CERTIFICATE----- -MIIDpjCCAw+gAwIBAgIBAjANBgkqhkiG9w0BAQsFADB9MQswCQYDVQQGEwJDTjEL -MAkGA1UECBMCWkoxCzAJBgNVBAcTAlpKMQswCQYDVQQKEwJaSjELMAkGA1UECxMC -WkoxDjAMBgNVBAMTBVpKIENBMRAwDgYDVQQpEwdFYXN5UlNBMRgwFgYJKoZIhvcN -AQkBFglaSkBaSi5jb20wHhcNMTcwODIzMTQyNjU4WhcNMjcwODIxMTQyNjU4WjB/ -MQswCQYDVQQGEwJDTjELMAkGA1UECBMCWkoxCzAJBgNVBAcTAlpKMQswCQYDVQQK -EwJaSjELMAkGA1UECxMCWkoxEDAOBgNVBAMTB2NsaWVudDExEDAOBgNVBCkTB0Vh -c3lSU0ExGDAWBgkqhkiG9w0BCQEWCVpKQFpKLmNvbTCBnzANBgkqhkiG9w0BAQEF -AAOBjQAwgYkCgYEAt2tAC8Hvp8P6VDLC14f6rIUYrq9Eut1XD0Nz6983Xl6PrUN6 -h92mvWoLaI11DP5JOeFUEVMPtWMQWyGYf1Mys9awPSP8Ha0GsPD7ECeD4V5atPZ8 -AodMc4Z7eQfKpxwYLHDjnebwiQZLJSwJOVHD1ETvgV6q4GPYEcac4G/YZhECAwEA -AaOCATIwggEuMAkGA1UdEwQCMAAwLQYJYIZIAYb4QgENBCAWHkVhc3ktUlNBIEdl -bmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQU6BX5ccSnwkGjr/XFk1GOXWeb -EuIwgbAGA1UdIwSBqDCBpYAUjdUEeRAFTxsSYxGsANT8zDEAuAmhgYGkfzB9MQsw -CQYDVQQGEwJDTjELMAkGA1UECBMCWkoxCzAJBgNVBAcTAlpKMQswCQYDVQQKEwJa -SjELMAkGA1UECxMCWkoxDjAMBgNVBAMTBVpKIENBMRAwDgYDVQQpEwdFYXN5UlNB -MRgwFgYJKoZIhvcNAQkBFglaSkBaSi5jb22CCQCuGKHhPVJN8DATBgNVHSUEDDAK -BggrBgEFBQcDAjALBgNVHQ8EBAMCB4AwDQYJKoZIhvcNAQELBQADgYEAW2PC5eQE -rfS2diTflKWwopk4+ee0L3mRURsGSzP8THTORz5UG9rqQ+Ntbuy0zXeG6upIoXlw -XP+ZDvu9/A2Jpi4T/oaCaTNMKCENqLoaPscuLZcMWu3jr3P8u8lYBcUmVhMcPo+Q -x+jZ5QsfQJr6FUm52I5q/XH0PN+hEa/76qg= ------END CERTIFICATE----- diff --git a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/ca.crt b/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/ca.crt deleted file mode 100755 index 7b7ba5ef81..0000000000 --- a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/ca.crt +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDXDCCAsWgAwIBAgIJAK4YoeE9Uk3wMA0GCSqGSIb3DQEBCwUAMH0xCzAJBgNV -BAYTAkNOMQswCQYDVQQIEwJaSjELMAkGA1UEBxMCWkoxCzAJBgNVBAoTAlpKMQsw -CQYDVQQLEwJaSjEOMAwGA1UEAxMFWkogQ0ExEDAOBgNVBCkTB0Vhc3lSU0ExGDAW -BgkqhkiG9w0BCQEWCVpKQFpKLmNvbTAeFw0xNzA4MjMxNDE4MDVaFw0yNzA4MjEx -NDE4MDVaMH0xCzAJBgNVBAYTAkNOMQswCQYDVQQIEwJaSjELMAkGA1UEBxMCWkox -CzAJBgNVBAoTAlpKMQswCQYDVQQLEwJaSjEOMAwGA1UEAxMFWkogQ0ExEDAOBgNV -BCkTB0Vhc3lSU0ExGDAWBgkqhkiG9w0BCQEWCVpKQFpKLmNvbTCBnzANBgkqhkiG -9w0BAQEFAAOBjQAwgYkCgYEAsLBNLkjfNUK4Rb3xgJD0EEgzp6b+5zkiibT3wdS9 -SKZqkqJRcM/z7Ifc79LKXDDHrVnajkyc8QSaXOKVW8pTx75fYnoHjNbeU9JZHoTg -9GgRWq5HHUJlxhsdbcGeTxOHrMRz2d+VzvNvs5KOLJaqGkRmm/KMb7nTRnwjhx4A -pWsCAwEAAaOB4zCB4DAdBgNVHQ4EFgQUjdUEeRAFTxsSYxGsANT8zDEAuAkwgbAG -A1UdIwSBqDCBpYAUjdUEeRAFTxsSYxGsANT8zDEAuAmhgYGkfzB9MQswCQYDVQQG -EwJDTjELMAkGA1UECBMCWkoxCzAJBgNVBAcTAlpKMQswCQYDVQQKEwJaSjELMAkG -A1UECxMCWkoxDjAMBgNVBAMTBVpKIENBMRAwDgYDVQQpEwdFYXN5UlNBMRgwFgYJ -KoZIhvcNAQkBFglaSkBaSi5jb22CCQCuGKHhPVJN8DAMBgNVHRMEBTADAQH/MA0G -CSqGSIb3DQEBCwUAA4GBAAAN0aRmQGNsF23CxShEnj3ohgpYA20F2FwEWYmCCWXe -CKxuPGtPZAeLmToIMgn75QlyuvVG+Uoe7I6ylbEK3XoeNStcS61wAXL8hIPfMcUX -fDsImBvc+Bo+LxQMWMSz0r88+B8784KELyaQKOnvPlTrnTuyP9RftjUWpjy23Kjd ------END CERTIFICATE----- diff --git a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/ca.key b/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/ca.key deleted file mode 100755 index 796fbf10ea..0000000000 --- a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/ca.key +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBALCwTS5I3zVCuEW9 -8YCQ9BBIM6em/uc5Iom098HUvUimapKiUXDP8+yH3O/Sylwwx61Z2o5MnPEEmlzi -lVvKU8e+X2J6B4zW3lPSWR6E4PRoEVquRx1CZcYbHW3Bnk8Th6zEc9nflc7zb7OS -jiyWqhpEZpvyjG+500Z8I4ceAKVrAgMBAAECgYBfiTRyTlzCg6z3qNioV7hgBWpI -wHcbtz0BkKRWXh1q5vDBEJtQkGCoCF5iHmvkpUuSY/9U6gACIicFCk8QLrpVZGzY -1SgOQS796La2gYR0clCvtsf8Kg4BYCKkF40jGDGZTGKtWa9mPuOZXZFhSMZJiCQi -UIfTN3D9Ngt/nLFMwQJBANwavdYXnPxGr/0rL1ct0RUjsZLyd9kmr1gD4Nq+/uwC -FQrNHl/ieXOsSeD0eVNtuTFzmt8sTz963SXmbPv01dMCQQDNgPioq4M/1sluGUdI -yK5bantPAD7A7wTb+uryP7lNMuDSGTXgLsh+RrhBuDlUdi+OPc0dIJV1fTjEiLbI -fLsJAkEAoSSe6Zh+IaDrBfJRBYWQtuZcApasMfqFk227eMsuvcFEgJTt8QtRGeQA -bsbt8Ku7Uz4tG8lH99TPBglurwRwawJAALVrJhnBUB0LgMexiTy37TTGzBTyInQw -jhmlacRyfSOpxs+zcdx3cIgJ5qAeAn6N1227IViVa1xNL9BQ4QwdEQJBAJjLcCYS -twmgoyOj4K5+8+aAuuXWj7lpxEakOZbghrBmy0GytiRKN9wb/x8QF6EtrJAmYltL -wMMDUDE0zd+hc2Q= ------END PRIVATE KEY----- diff --git a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/client1.crt b/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/client1.crt deleted file mode 100755 index c757880eaa..0000000000 --- a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/client1.crt +++ /dev/null @@ -1,71 +0,0 @@ -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 2 (0x2) - Signature Algorithm: sha256WithRSAEncryption - Issuer: C=CN, ST=ZJ, L=ZJ, O=ZJ, OU=ZJ, CN=ZJ CA/name=EasyRSA/emailAddress=ZJ@ZJ.com - Validity - Not Before: Aug 23 14:26:58 2017 GMT - Not After : Aug 21 14:26:58 2027 GMT - Subject: C=CN, ST=ZJ, L=ZJ, O=ZJ, OU=ZJ, CN=client1/name=EasyRSA/emailAddress=ZJ@ZJ.com - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - Public-Key: (1024 bit) - Modulus: - 00:b7:6b:40:0b:c1:ef:a7:c3:fa:54:32:c2:d7:87: - fa:ac:85:18:ae:af:44:ba:dd:57:0f:43:73:eb:df: - 37:5e:5e:8f:ad:43:7a:87:dd:a6:bd:6a:0b:68:8d: - 75:0c:fe:49:39:e1:54:11:53:0f:b5:63:10:5b:21: - 98:7f:53:32:b3:d6:b0:3d:23:fc:1d:ad:06:b0:f0: - fb:10:27:83:e1:5e:5a:b4:f6:7c:02:87:4c:73:86: - 7b:79:07:ca:a7:1c:18:2c:70:e3:9d:e6:f0:89:06: - 4b:25:2c:09:39:51:c3:d4:44:ef:81:5e:aa:e0:63: - d8:11:c6:9c:e0:6f:d8:66:11 - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Basic Constraints: - CA:FALSE - Netscape Comment: - Easy-RSA Generated Certificate - X509v3 Subject Key Identifier: - E8:15:F9:71:C4:A7:C2:41:A3:AF:F5:C5:93:51:8E:5D:67:9B:12:E2 - X509v3 Authority Key Identifier: - keyid:8D:D5:04:79:10:05:4F:1B:12:63:11:AC:00:D4:FC:CC:31:00:B8:09 - DirName:/C=CN/ST=ZJ/L=ZJ/O=ZJ/OU=ZJ/CN=ZJ CA/name=EasyRSA/emailAddress=ZJ@ZJ.com - serial:AE:18:A1:E1:3D:52:4D:F0 - - X509v3 Extended Key Usage: - TLS Web Client Authentication - X509v3 Key Usage: - Digital Signature - Signature Algorithm: sha256WithRSAEncryption - 5b:63:c2:e5:e4:04:ad:f4:b6:76:24:df:94:a5:b0:a2:99:38: - f9:e7:b4:2f:79:91:51:1b:06:4b:33:fc:4c:74:ce:47:3e:54: - 1b:da:ea:43:e3:6d:6e:ec:b4:cd:77:86:ea:ea:48:a1:79:70: - 5c:ff:99:0e:fb:bd:fc:0d:89:a6:2e:13:fe:86:82:69:33:4c: - 28:21:0d:a8:ba:1a:3e:c7:2e:2d:97:0c:5a:ed:e3:af:73:fc: - bb:c9:58:05:c5:26:56:13:1c:3e:8f:90:c7:e8:d9:e5:0b:1f: - 40:9a:fa:15:49:b9:d8:8e:6a:fd:71:f4:3c:df:a1:11:af:fb: - ea:a8 ------BEGIN CERTIFICATE----- -MIIDpjCCAw+gAwIBAgIBAjANBgkqhkiG9w0BAQsFADB9MQswCQYDVQQGEwJDTjEL -MAkGA1UECBMCWkoxCzAJBgNVBAcTAlpKMQswCQYDVQQKEwJaSjELMAkGA1UECxMC -WkoxDjAMBgNVBAMTBVpKIENBMRAwDgYDVQQpEwdFYXN5UlNBMRgwFgYJKoZIhvcN -AQkBFglaSkBaSi5jb20wHhcNMTcwODIzMTQyNjU4WhcNMjcwODIxMTQyNjU4WjB/ -MQswCQYDVQQGEwJDTjELMAkGA1UECBMCWkoxCzAJBgNVBAcTAlpKMQswCQYDVQQK -EwJaSjELMAkGA1UECxMCWkoxEDAOBgNVBAMTB2NsaWVudDExEDAOBgNVBCkTB0Vh -c3lSU0ExGDAWBgkqhkiG9w0BCQEWCVpKQFpKLmNvbTCBnzANBgkqhkiG9w0BAQEF -AAOBjQAwgYkCgYEAt2tAC8Hvp8P6VDLC14f6rIUYrq9Eut1XD0Nz6983Xl6PrUN6 -h92mvWoLaI11DP5JOeFUEVMPtWMQWyGYf1Mys9awPSP8Ha0GsPD7ECeD4V5atPZ8 -AodMc4Z7eQfKpxwYLHDjnebwiQZLJSwJOVHD1ETvgV6q4GPYEcac4G/YZhECAwEA -AaOCATIwggEuMAkGA1UdEwQCMAAwLQYJYIZIAYb4QgENBCAWHkVhc3ktUlNBIEdl -bmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQU6BX5ccSnwkGjr/XFk1GOXWeb -EuIwgbAGA1UdIwSBqDCBpYAUjdUEeRAFTxsSYxGsANT8zDEAuAmhgYGkfzB9MQsw -CQYDVQQGEwJDTjELMAkGA1UECBMCWkoxCzAJBgNVBAcTAlpKMQswCQYDVQQKEwJa -SjELMAkGA1UECxMCWkoxDjAMBgNVBAMTBVpKIENBMRAwDgYDVQQpEwdFYXN5UlNB -MRgwFgYJKoZIhvcNAQkBFglaSkBaSi5jb22CCQCuGKHhPVJN8DATBgNVHSUEDDAK -BggrBgEFBQcDAjALBgNVHQ8EBAMCB4AwDQYJKoZIhvcNAQELBQADgYEAW2PC5eQE -rfS2diTflKWwopk4+ee0L3mRURsGSzP8THTORz5UG9rqQ+Ntbuy0zXeG6upIoXlw -XP+ZDvu9/A2Jpi4T/oaCaTNMKCENqLoaPscuLZcMWu3jr3P8u8lYBcUmVhMcPo+Q -x+jZ5QsfQJr6FUm52I5q/XH0PN+hEa/76qg= ------END CERTIFICATE----- diff --git a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/client1.csr b/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/client1.csr deleted file mode 100755 index a3549ca15e..0000000000 --- a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/client1.csr +++ /dev/null @@ -1,12 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIBvzCCASgCAQAwfzELMAkGA1UEBhMCQ04xCzAJBgNVBAgTAlpKMQswCQYDVQQH -EwJaSjELMAkGA1UEChMCWkoxCzAJBgNVBAsTAlpKMRAwDgYDVQQDEwdjbGllbnQx -MRAwDgYDVQQpEwdFYXN5UlNBMRgwFgYJKoZIhvcNAQkBFglaSkBaSi5jb20wgZ8w -DQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALdrQAvB76fD+lQywteH+qyFGK6vRLrd -Vw9Dc+vfN15ej61Deofdpr1qC2iNdQz+STnhVBFTD7VjEFshmH9TMrPWsD0j/B2t -BrDw+xAng+FeWrT2fAKHTHOGe3kHyqccGCxw453m8IkGSyUsCTlRw9RE74FequBj -2BHGnOBv2GYRAgMBAAGgADANBgkqhkiG9w0BAQsFAAOBgQBfvn2fP2Tj8FTZH+Xk -9u04rYaQdspSyL61F4QIEiP5UOUzbnSSU/B72KF5gm8b0irXGnTbHlXeMv6WXaAS -VF1fEeM+gsGJIDOvomT5PKfudezr6DpGrUammQnRY3tho078Ao0Mkq8PAWpiVWGV -Z7rsqHhI3mWYLNyne9n8K224pg== ------END CERTIFICATE REQUEST----- diff --git a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/client1.key b/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/client1.key deleted file mode 100755 index 076ce4e72b..0000000000 --- a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/client1.key +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBALdrQAvB76fD+lQy -wteH+qyFGK6vRLrdVw9Dc+vfN15ej61Deofdpr1qC2iNdQz+STnhVBFTD7VjEFsh -mH9TMrPWsD0j/B2tBrDw+xAng+FeWrT2fAKHTHOGe3kHyqccGCxw453m8IkGSyUs -CTlRw9RE74FequBj2BHGnOBv2GYRAgMBAAECgYBhWatEkkqA4KOczNRdUO7bYkkX -bi8sfw4WK9b6+h6JF+dqLsZ6FkrJfd9QPsRBgTWcYtwb1dogi9PCirJF4gKmSsv1 -h/BISW4lrXJPf08aJAuBF0ym8XZUgVLLptn8KdXX3xc6YF6K336AnNNLZ80X4El8 -m7X4d8Y3F4k3Dj04AQJBAN9NkHYwevaZ8jfv5rZSTKECmdk1DZITd756+sObFAs1 -vX9VfunwVw6xWmaUyMt8oPFqb0wKES9zqrViaMhU9YkCQQDSRqV3ldHcaZJ6sTgm -T8ZKm+UpbC4zat4rGSBYKaoeLRPh5nxP892rOfBAevkoIQzW7LfVfoMImM/i1J6T -lNJJAkAHSOZ/lJFOXjNSs9bY99JcJlOSjHKG42+ynRx1KSf8PaKS9t0PELImXo7O -begnC0fM2GYNGv74h1N4W1+DuZHRAkEAlNov3jSvh+EwMSxs/Cnyy/QJyEXteraH -KWkzDVYJOC1e6sZXb93JKKHuIicrY63pwed2x2o0ZgyO9RrgWsa6CQJBAMogPcRO -jUGjYs3IYXW6Suf1bRJN2aS81gx7lqyLQE3ignH6e9kMxcrzG4AzzePCLouY3waL -HS1KW8V9I5c4qTs= ------END PRIVATE KEY----- diff --git a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/client1.p12 b/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/client1.p12 deleted file mode 100755 index 1511e1d0af..0000000000 Binary files a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/client1.p12 and /dev/null differ diff --git a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/dh1024.pem b/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/dh1024.pem deleted file mode 100755 index 01eba3e5a1..0000000000 --- a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/dh1024.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN DH PARAMETERS----- -MIGHAoGBAMzJWsEtMQ76G81O8RzEweDaPrio4NihRBo0fmNuh3IjJtFJ++URPW4y -HHtnGOkPoMwQjGQ3GQV+lfcR7QGWojET4NskXOk6mdFU+/nYB9s5YY7RR4qyln9b -dNMp3KnMLtILNH1rJRoqYbSNoz3Z2cS59Ejp1dgXqN8kSP8wiqDjAgEC ------END DH PARAMETERS----- diff --git a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/index.txt b/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/index.txt deleted file mode 100644 index 4bb34b80fc..0000000000 --- a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/index.txt +++ /dev/null @@ -1,2 +0,0 @@ -V 270821142642Z 01 unknown /C=CN/ST=ZJ/L=ZJ/O=ZJ/OU=ZJ/CN=server/name=EasyRSA/emailAddress=ZJ@ZJ.com -V 270821142658Z 02 unknown /C=CN/ST=ZJ/L=ZJ/O=ZJ/OU=ZJ/CN=client1/name=EasyRSA/emailAddress=ZJ@ZJ.com diff --git a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/index.txt.attr b/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/index.txt.attr deleted file mode 100755 index 8f7e63a347..0000000000 --- a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/index.txt.attr +++ /dev/null @@ -1 +0,0 @@ -unique_subject = yes diff --git a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/index.txt.attr.old b/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/index.txt.attr.old deleted file mode 100755 index 8f7e63a347..0000000000 --- a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/index.txt.attr.old +++ /dev/null @@ -1 +0,0 @@ -unique_subject = yes diff --git a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/index.txt.old b/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/index.txt.old deleted file mode 100755 index d74831ee49..0000000000 --- a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/index.txt.old +++ /dev/null @@ -1 +0,0 @@ -V 270821142642Z 01 unknown /C=CN/ST=ZJ/L=ZJ/O=ZJ/OU=ZJ/CN=server/name=EasyRSA/emailAddress=ZJ@ZJ.com diff --git a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/serial b/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/serial deleted file mode 100755 index 75016ea362..0000000000 --- a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/serial +++ /dev/null @@ -1 +0,0 @@ -03 diff --git a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/serial.old b/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/serial.old deleted file mode 100755 index 9e22bcb8e3..0000000000 --- a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/serial.old +++ /dev/null @@ -1 +0,0 @@ -02 diff --git a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/server.crt b/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/server.crt deleted file mode 100755 index a73a757e94..0000000000 --- a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/server.crt +++ /dev/null @@ -1,74 +0,0 @@ -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 1 (0x1) - Signature Algorithm: sha256WithRSAEncryption - Issuer: C=CN, ST=ZJ, L=ZJ, O=ZJ, OU=ZJ, CN=ZJ CA/name=EasyRSA/emailAddress=ZJ@ZJ.com - Validity - Not Before: Aug 23 14:26:42 2017 GMT - Not After : Aug 21 14:26:42 2027 GMT - Subject: C=CN, ST=ZJ, L=ZJ, O=ZJ, OU=ZJ, CN=server/name=EasyRSA/emailAddress=ZJ@ZJ.com - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - Public-Key: (1024 bit) - Modulus: - 00:e0:67:2e:33:ab:4f:4f:a1:78:c6:32:ba:d3:1d: - 71:73:34:ba:45:40:88:87:76:03:fb:87:d8:4e:4e: - 7c:7d:95:22:7d:8e:70:dc:68:10:27:fe:7d:f0:79: - 93:86:83:ef:a9:16:78:ae:86:5e:ea:42:74:38:4d: - 37:0d:c9:34:a6:84:5e:64:ad:dd:91:dd:df:02:bf: - 53:f8:fb:c0:9b:cb:bd:93:7c:26:ab:bd:0a:c6:c3: - 5d:da:5d:b3:c0:ff:72:a1:2f:1e:0b:f6:a6:71:77: - f9:00:38:8a:ae:ab:c0:86:11:ab:12:de:1e:82:13: - e8:c3:d5:bb:6f:2e:bf:6e:c1 - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Basic Constraints: - CA:FALSE - Netscape Cert Type: - SSL Server - Netscape Comment: - Easy-RSA Generated Server Certificate - X509v3 Subject Key Identifier: - 1C:06:47:33:61:0E:15:84:D5:08:5A:40:E6:C9:23:EF:87:F3:EE:F9 - X509v3 Authority Key Identifier: - keyid:8D:D5:04:79:10:05:4F:1B:12:63:11:AC:00:D4:FC:CC:31:00:B8:09 - DirName:/C=CN/ST=ZJ/L=ZJ/O=ZJ/OU=ZJ/CN=ZJ CA/name=EasyRSA/emailAddress=ZJ@ZJ.com - serial:AE:18:A1:E1:3D:52:4D:F0 - - X509v3 Extended Key Usage: - TLS Web Server Authentication - X509v3 Key Usage: - Digital Signature, Key Encipherment - Signature Algorithm: sha256WithRSAEncryption - aa:b5:0d:7a:b3:09:7a:d4:e6:df:46:0d:54:39:e2:34:da:4f: - 9b:92:d6:41:db:10:b9:ed:66:34:7f:9d:a9:fa:af:6a:80:b4: - 1f:13:d3:39:a6:72:93:5a:6b:e8:4f:ba:95:f9:83:10:58:b3: - fe:12:3f:a9:e8:31:04:e0:8e:d8:4c:c1:f7:7e:fc:7a:ba:17: - d8:2e:76:ab:7c:17:ca:a4:1d:3d:c5:bc:df:02:e5:2e:91:c4: - b2:6c:40:a1:e2:3d:64:15:da:a6:b0:e4:1d:66:11:54:c0:49: - 05:91:c4:69:68:2d:bc:d5:f6:32:43:3c:18:c4:97:54:45:52: - 28:36 ------BEGIN CERTIFICATE----- -MIIDvzCCAyigAwIBAgIBATANBgkqhkiG9w0BAQsFADB9MQswCQYDVQQGEwJDTjEL -MAkGA1UECBMCWkoxCzAJBgNVBAcTAlpKMQswCQYDVQQKEwJaSjELMAkGA1UECxMC -WkoxDjAMBgNVBAMTBVpKIENBMRAwDgYDVQQpEwdFYXN5UlNBMRgwFgYJKoZIhvcN -AQkBFglaSkBaSi5jb20wHhcNMTcwODIzMTQyNjQyWhcNMjcwODIxMTQyNjQyWjB+ -MQswCQYDVQQGEwJDTjELMAkGA1UECBMCWkoxCzAJBgNVBAcTAlpKMQswCQYDVQQK -EwJaSjELMAkGA1UECxMCWkoxDzANBgNVBAMTBnNlcnZlcjEQMA4GA1UEKRMHRWFz -eVJTQTEYMBYGCSqGSIb3DQEJARYJWkpAWkouY29tMIGfMA0GCSqGSIb3DQEBAQUA -A4GNADCBiQKBgQDgZy4zq09PoXjGMrrTHXFzNLpFQIiHdgP7h9hOTnx9lSJ9jnDc -aBAn/n3weZOGg++pFniuhl7qQnQ4TTcNyTSmhF5krd2R3d8Cv1P4+8Cby72TfCar -vQrGw13aXbPA/3KhLx4L9qZxd/kAOIquq8CGEasS3h6CE+jD1btvLr9uwQIDAQAB -o4IBTDCCAUgwCQYDVR0TBAIwADARBglghkgBhvhCAQEEBAMCBkAwNAYJYIZIAYb4 -QgENBCcWJUVhc3ktUlNBIEdlbmVyYXRlZCBTZXJ2ZXIgQ2VydGlmaWNhdGUwHQYD -VR0OBBYEFBwGRzNhDhWE1QhaQObJI++H8+75MIGwBgNVHSMEgagwgaWAFI3VBHkQ -BU8bEmMRrADU/MwxALgJoYGBpH8wfTELMAkGA1UEBhMCQ04xCzAJBgNVBAgTAlpK -MQswCQYDVQQHEwJaSjELMAkGA1UEChMCWkoxCzAJBgNVBAsTAlpKMQ4wDAYDVQQD -EwVaSiBDQTEQMA4GA1UEKRMHRWFzeVJTQTEYMBYGCSqGSIb3DQEJARYJWkpAWkou -Y29tggkArhih4T1STfAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwCwYDVR0PBAQDAgWg -MA0GCSqGSIb3DQEBCwUAA4GBAKq1DXqzCXrU5t9GDVQ54jTaT5uS1kHbELntZjR/ -nan6r2qAtB8T0zmmcpNaa+hPupX5gxBYs/4SP6noMQTgjthMwfd+/Hq6F9gudqt8 -F8qkHT3FvN8C5S6RxLJsQKHiPWQV2qaw5B1mEVTASQWRxGloLbzV9jJDPBjEl1RF -Uig2 ------END CERTIFICATE----- diff --git a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/server.csr b/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/server.csr deleted file mode 100755 index c83aadabec..0000000000 --- a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/server.csr +++ /dev/null @@ -1,12 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIBvjCCAScCAQAwfjELMAkGA1UEBhMCQ04xCzAJBgNVBAgTAlpKMQswCQYDVQQH -EwJaSjELMAkGA1UEChMCWkoxCzAJBgNVBAsTAlpKMQ8wDQYDVQQDEwZzZXJ2ZXIx -EDAOBgNVBCkTB0Vhc3lSU0ExGDAWBgkqhkiG9w0BCQEWCVpKQFpKLmNvbTCBnzAN -BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA4GcuM6tPT6F4xjK60x1xczS6RUCIh3YD -+4fYTk58fZUifY5w3GgQJ/598HmThoPvqRZ4roZe6kJ0OE03Dck0poReZK3dkd3f -Ar9T+PvAm8u9k3wmq70KxsNd2l2zwP9yoS8eC/amcXf5ADiKrqvAhhGrEt4eghPo -w9W7by6/bsECAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4GBAMrytQrG3MGVTD2vsZkw -hJn9U4MYmikqFxEcSJ+JEeDJ0w3NTn95XJmFtmuT/CwsrnP9g+1neSpCXsZewozd -QRisYBF9Rl9qw9fH2o1S/GIVpTDIiTtWjegZA6FPkhQQyY387LU9Lp4vG9hdNbuz -QNDs6cI9T0U53PZiq7R65rGV ------END CERTIFICATE REQUEST----- diff --git a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/server.key b/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/server.key deleted file mode 100755 index 3aab5cd4bb..0000000000 --- a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/keys/server.key +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAOBnLjOrT0+heMYy -utMdcXM0ukVAiId2A/uH2E5OfH2VIn2OcNxoECf+ffB5k4aD76kWeK6GXupCdDhN -Nw3JNKaEXmSt3ZHd3wK/U/j7wJvLvZN8Jqu9CsbDXdpds8D/cqEvHgv2pnF3+QA4 -iq6rwIYRqxLeHoIT6MPVu28uv27BAgMBAAECgYEAqno4g1BVxG0rT4cin1fy5E7e -Y9YO4ropdGFTVsoRkWZG+ZPI8eisvXV9P79c8AgzfgVwUUYLvXQWzt76QCLnN11x -pBURloJbEReEEzIF6z3LiT9CKgVWY4vtC6f5OW4Kd+EZxXMftFz8kMzRuRQLvOzR -WeU+3GD42mIwYjsXBrECQQD2P6azeZJ1ZIEf+9Ys19tSQ6uxbXyvghlTfhmZfBW3 -bshNRH4+L4lnnbm75pFkWqR0gYSAD3toRymccctN2K9jAkEA6UoRwURTjIER8yZO -6gLTFtzb841jv6TPErOY7CzNZ/TYBUdUBmM/NB4+RgBpBNFXB3uqweNVPO6mhyQP -zB88iwJBAOeH6YGOqTpfiVk9PJ9lRf4PSnvE6htLQ+zQ/9jkZrbWHtcns1tc7uDR -2DToEYQ+BarVrHOMGwhtAJ7sD6/eMOkCQFjn8XxGHdEeH0kbAFgOW4QLB4f6Clmu -5XurFkxrhpxnoyvf0xXcHOov3GuxHFTJsvEXICxkBsgB61T1WU/hV6ECQGzk5Eqo -uik2OAYMOb7NPGYMWS68DpmP11QDuvoj5zm2vdzohXHyBM7mO12MLSrTpxfgjWhQ -pqwEbErchuKkzN4= ------END PRIVATE KEY----- diff --git a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/openssl-1.0.0.cnf b/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/openssl-1.0.0.cnf deleted file mode 100755 index 93ac6eaba8..0000000000 --- a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/openssl-1.0.0.cnf +++ /dev/null @@ -1,286 +0,0 @@ -# For use with easy-rsa version 2.0 and OpenSSL 1.0.0* - -# This definition stops the following lines choking if HOME isn't -# defined. -HOME = . -RANDFILE = $ENV::HOME/.rnd -openssl_conf = openssl_init - -[ openssl_init ] -# Extra OBJECT IDENTIFIER info: -#oid_file = $ENV::HOME/.oid -oid_section = new_oids -engines = engine_section - -# To use this configuration file with the "-extfile" option of the -# "openssl x509" utility, name here the section containing the -# X.509v3 extensions to use: -# extensions = -# (Alternatively, use a configuration file that has only -# X.509v3 extensions in its main [= default] section.) - -[ new_oids ] - -# We can add new OIDs in here for use by 'ca' and 'req'. -# Add a simple OID like this: -# testoid1=1.2.3.4 -# Or use config file substitution like this: -# testoid2=${testoid1}.5.6 - -#################################################################### -[ ca ] -default_ca = CA_default # The default ca section - -#################################################################### -[ CA_default ] - -dir = $ENV::KEY_DIR # Where everything is kept -certs = $dir # Where the issued certs are kept -crl_dir = $dir # Where the issued crl are kept -database = $dir/index.txt # database index file. -new_certs_dir = $dir # default place for new certs. - -certificate = $dir/ca.crt # The CA certificate -serial = $dir/serial # The current serial number -crl = $dir/crl.pem # The current CRL -private_key = $dir/ca.key # The private key -RANDFILE = $dir/.rand # private random number file - -x509_extensions = usr_cert # The extentions to add to the cert - -# Extensions to add to a CRL. Note: Netscape communicator chokes on V2 CRLs -# so this is commented out by default to leave a V1 CRL. -# crl_extensions = crl_ext - -default_days = 3650 # how long to certify for -default_crl_days= 30 # how long before next CRL -default_md = sha256 # use public key default MD -preserve = no # keep passed DN ordering - -# A few difference way of specifying how similar the request should look -# For type CA, the listed attributes must be the same, and the optional -# and supplied fields are just that :-) -policy = policy_anything - -# For the CA policy -[ policy_match ] -countryName = match -stateOrProvinceName = match -organizationName = match -organizationalUnitName = optional -commonName = supplied -name = optional -emailAddress = optional - -# For the 'anything' policy -# At this point in time, you must list all acceptable 'object' -# types. -[ policy_anything ] -countryName = optional -stateOrProvinceName = optional -localityName = optional -organizationName = optional -organizationalUnitName = optional -commonName = supplied -name = optional -emailAddress = optional - -#################################################################### -[ req ] -default_bits = $ENV::KEY_SIZE -default_keyfile = privkey.pem -default_md = sha256 -distinguished_name = req_distinguished_name -attributes = req_attributes -x509_extensions = v3_ca # The extentions to add to the self signed cert - -# Passwords for private keys if not present they will be prompted for -# input_password = secret -# output_password = secret - -# This sets a mask for permitted string types. There are several options. -# default: PrintableString, T61String, BMPString. -# pkix : PrintableString, BMPString (PKIX recommendation after 2004). -# utf8only: only UTF8Strings (PKIX recommendation after 2004). -# nombstr : PrintableString, T61String (no BMPStrings or UTF8Strings). -# MASK:XXXX a literal mask value. -string_mask = nombstr - -# req_extensions = v3_req # The extensions to add to a certificate request - -[ req_distinguished_name ] -countryName = Country Name (2 letter code) -countryName_default = $ENV::KEY_COUNTRY -countryName_min = 2 -countryName_max = 2 - -stateOrProvinceName = State or Province Name (full name) -stateOrProvinceName_default = $ENV::KEY_PROVINCE - -localityName = Locality Name (eg, city) -localityName_default = $ENV::KEY_CITY - -0.organizationName = Organization Name (eg, company) -0.organizationName_default = $ENV::KEY_ORG - -# we can do this but it is not needed normally :-) -#1.organizationName = Second Organization Name (eg, company) -#1.organizationName_default = World Wide Web Pty Ltd - -organizationalUnitName = Organizational Unit Name (eg, section) -#organizationalUnitName_default = - -commonName = Common Name (eg, your name or your server\'s hostname) -commonName_max = 64 - -name = Name -name_max = 64 - -emailAddress = Email Address -emailAddress_default = $ENV::KEY_EMAIL -emailAddress_max = 40 - -# JY -- added for batch mode -organizationalUnitName_default = $ENV::KEY_OU -commonName_default = $ENV::KEY_CN -name_default = $ENV::KEY_NAME - - -# SET-ex3 = SET extension number 3 - -[ req_attributes ] -challengePassword = A challenge password -challengePassword_min = 4 -challengePassword_max = 20 - -unstructuredName = An optional company name - -[ usr_cert ] - -# These extensions are added when 'ca' signs a request. - -# This goes against PKIX guidelines but some CAs do it and some software -# requires this to avoid interpreting an end user certificate as a CA. - -basicConstraints=CA:FALSE - -# Here are some examples of the usage of nsCertType. If it is omitted -# the certificate can be used for anything *except* object signing. - -# This is OK for an SSL server. -# nsCertType = server - -# For an object signing certificate this would be used. -# nsCertType = objsign - -# For normal client use this is typical -# nsCertType = client, email - -# and for everything including object signing: -# nsCertType = client, email, objsign - -# This is typical in keyUsage for a client certificate. -# keyUsage = nonRepudiation, digitalSignature, keyEncipherment - -# This will be displayed in Netscape's comment listbox. -nsComment = "Easy-RSA Generated Certificate" - -# PKIX recommendations harmless if included in all certificates. -subjectKeyIdentifier=hash -authorityKeyIdentifier=keyid,issuer:always -extendedKeyUsage=clientAuth -keyUsage = digitalSignature - - -# This stuff is for subjectAltName and issuerAltname. -# Import the email address. -# subjectAltName=email:copy - -# Copy subject details -# issuerAltName=issuer:copy - -#nsCaRevocationUrl = http://www.domain.dom/ca-crl.pem -#nsBaseUrl -#nsRevocationUrl -#nsRenewalUrl -#nsCaPolicyUrl -#nsSslServerName - -[ server ] - -# JY ADDED -- Make a cert with nsCertType set to "server" -basicConstraints=CA:FALSE -nsCertType = server -nsComment = "Easy-RSA Generated Server Certificate" -subjectKeyIdentifier=hash -authorityKeyIdentifier=keyid,issuer:always -extendedKeyUsage=serverAuth -keyUsage = digitalSignature, keyEncipherment - -[ v3_req ] - -# Extensions to add to a certificate request - -basicConstraints = CA:FALSE -keyUsage = nonRepudiation, digitalSignature, keyEncipherment - -[ v3_ca ] - - -# Extensions for a typical CA - - -# PKIX recommendation. - -subjectKeyIdentifier=hash - -authorityKeyIdentifier=keyid:always,issuer:always - -# This is what PKIX recommends but some broken software chokes on critical -# extensions. -#basicConstraints = critical,CA:true -# So we do this instead. -basicConstraints = CA:true - -# Key usage: this is typical for a CA certificate. However since it will -# prevent it being used as an test self-signed certificate it is best -# left out by default. -# keyUsage = cRLSign, keyCertSign - -# Some might want this also -# nsCertType = sslCA, emailCA - -# Include email address in subject alt name: another PKIX recommendation -# subjectAltName=email:copy -# Copy issuer details -# issuerAltName=issuer:copy - -# DER hex encoding of an extension: beware experts only! -# obj=DER:02:03 -# Where 'obj' is a standard or added object -# You can even override a supported extension: -# basicConstraints= critical, DER:30:03:01:01:FF - -[ crl_ext ] - -# CRL extensions. -# Only issuerAltName and authorityKeyIdentifier make any sense in a CRL. - -# issuerAltName=issuer:copy -authorityKeyIdentifier=keyid:always,issuer:always - -[ engine_section ] -# -# If you are using PKCS#11 -# Install engine_pkcs11 of opensc (www.opensc.org) -# And uncomment the following -# verify that dynamic_path points to the correct location -# -#pkcs11 = pkcs11_section - -[ pkcs11_section ] -engine_id = pkcs11 -dynamic_path = /usr/lib/engines/engine_pkcs11.so -MODULE_PATH = $ENV::PKCS11_MODULE_PATH -PIN = $ENV::PKCS11_PIN -init = 0 diff --git a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/vars b/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/vars deleted file mode 100755 index 4873fbcf74..0000000000 --- a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/easy-rsa/vars +++ /dev/null @@ -1,19 +0,0 @@ -export EASY_RSA="/etc/easy-rsa" -export OPENSSL="openssl" -export PKCS11TOOL="pkcs11-tool" -export GREP="grep" -export KEY_CONFIG=`/usr/sbin/whichopensslcnf $EASY_RSA` -export KEY_DIR="$EASY_RSA/keys" -echo NOTE: If you run ./clean-all, I will be doing a rm -rf on $KEY_DIR -export PKCS11_MODULE_PATH="dummy" -export PKCS11_PIN="dummy" -export KEY_SIZE=1024 -export CA_EXPIRE=3650 -export KEY_EXPIRE=3650 -export KEY_COUNTRY="CN" -export KEY_PROVINCE="ZJ" -export KEY_CITY="ZJ" -export KEY_ORG="ZJ" -export KEY_EMAIL="ZJ@ZJ.com" -export KEY_OU="ZJ" -export KEY_NAME="EasyRSA" \ No newline at end of file diff --git a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/genovpn.sh b/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/genovpn.sh deleted file mode 100755 index 146d6b2369..0000000000 --- a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/genovpn.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -ddns=`uci get openvpn.myvpn.ddns` -port=`uci get openvpn.myvpn.port` -proto=`uci get openvpn.myvpn.proto` - -cat > /tmp/my.ovpn <' >> /tmp/my.ovpn -cat /etc/openvpn/ca.crt >> /tmp/my.ovpn -echo '' >> /tmp/my.ovpn -echo '' >> /tmp/my.ovpn -cat /etc/openvpn/client1.crt >> /tmp/my.ovpn -echo '' >> /tmp/my.ovpn -echo '' >> /tmp/my.ovpn -cat /etc/openvpn/client1.key >> /tmp/my.ovpn -echo '' >> /tmp/my.ovpn -[ -f /etc/ovpnadd.conf ] && cat /etc/ovpnadd.conf >> /tmp/my.ovpn diff --git a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/openvpn/ca.crt b/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/openvpn/ca.crt deleted file mode 100755 index 7b7ba5ef81..0000000000 --- a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/openvpn/ca.crt +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDXDCCAsWgAwIBAgIJAK4YoeE9Uk3wMA0GCSqGSIb3DQEBCwUAMH0xCzAJBgNV -BAYTAkNOMQswCQYDVQQIEwJaSjELMAkGA1UEBxMCWkoxCzAJBgNVBAoTAlpKMQsw -CQYDVQQLEwJaSjEOMAwGA1UEAxMFWkogQ0ExEDAOBgNVBCkTB0Vhc3lSU0ExGDAW -BgkqhkiG9w0BCQEWCVpKQFpKLmNvbTAeFw0xNzA4MjMxNDE4MDVaFw0yNzA4MjEx -NDE4MDVaMH0xCzAJBgNVBAYTAkNOMQswCQYDVQQIEwJaSjELMAkGA1UEBxMCWkox -CzAJBgNVBAoTAlpKMQswCQYDVQQLEwJaSjEOMAwGA1UEAxMFWkogQ0ExEDAOBgNV -BCkTB0Vhc3lSU0ExGDAWBgkqhkiG9w0BCQEWCVpKQFpKLmNvbTCBnzANBgkqhkiG -9w0BAQEFAAOBjQAwgYkCgYEAsLBNLkjfNUK4Rb3xgJD0EEgzp6b+5zkiibT3wdS9 -SKZqkqJRcM/z7Ifc79LKXDDHrVnajkyc8QSaXOKVW8pTx75fYnoHjNbeU9JZHoTg -9GgRWq5HHUJlxhsdbcGeTxOHrMRz2d+VzvNvs5KOLJaqGkRmm/KMb7nTRnwjhx4A -pWsCAwEAAaOB4zCB4DAdBgNVHQ4EFgQUjdUEeRAFTxsSYxGsANT8zDEAuAkwgbAG -A1UdIwSBqDCBpYAUjdUEeRAFTxsSYxGsANT8zDEAuAmhgYGkfzB9MQswCQYDVQQG -EwJDTjELMAkGA1UECBMCWkoxCzAJBgNVBAcTAlpKMQswCQYDVQQKEwJaSjELMAkG -A1UECxMCWkoxDjAMBgNVBAMTBVpKIENBMRAwDgYDVQQpEwdFYXN5UlNBMRgwFgYJ -KoZIhvcNAQkBFglaSkBaSi5jb22CCQCuGKHhPVJN8DAMBgNVHRMEBTADAQH/MA0G -CSqGSIb3DQEBCwUAA4GBAAAN0aRmQGNsF23CxShEnj3ohgpYA20F2FwEWYmCCWXe -CKxuPGtPZAeLmToIMgn75QlyuvVG+Uoe7I6ylbEK3XoeNStcS61wAXL8hIPfMcUX -fDsImBvc+Bo+LxQMWMSz0r88+B8784KELyaQKOnvPlTrnTuyP9RftjUWpjy23Kjd ------END CERTIFICATE----- diff --git a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/openvpn/client1.crt b/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/openvpn/client1.crt deleted file mode 100755 index c757880eaa..0000000000 --- a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/openvpn/client1.crt +++ /dev/null @@ -1,71 +0,0 @@ -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 2 (0x2) - Signature Algorithm: sha256WithRSAEncryption - Issuer: C=CN, ST=ZJ, L=ZJ, O=ZJ, OU=ZJ, CN=ZJ CA/name=EasyRSA/emailAddress=ZJ@ZJ.com - Validity - Not Before: Aug 23 14:26:58 2017 GMT - Not After : Aug 21 14:26:58 2027 GMT - Subject: C=CN, ST=ZJ, L=ZJ, O=ZJ, OU=ZJ, CN=client1/name=EasyRSA/emailAddress=ZJ@ZJ.com - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - Public-Key: (1024 bit) - Modulus: - 00:b7:6b:40:0b:c1:ef:a7:c3:fa:54:32:c2:d7:87: - fa:ac:85:18:ae:af:44:ba:dd:57:0f:43:73:eb:df: - 37:5e:5e:8f:ad:43:7a:87:dd:a6:bd:6a:0b:68:8d: - 75:0c:fe:49:39:e1:54:11:53:0f:b5:63:10:5b:21: - 98:7f:53:32:b3:d6:b0:3d:23:fc:1d:ad:06:b0:f0: - fb:10:27:83:e1:5e:5a:b4:f6:7c:02:87:4c:73:86: - 7b:79:07:ca:a7:1c:18:2c:70:e3:9d:e6:f0:89:06: - 4b:25:2c:09:39:51:c3:d4:44:ef:81:5e:aa:e0:63: - d8:11:c6:9c:e0:6f:d8:66:11 - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Basic Constraints: - CA:FALSE - Netscape Comment: - Easy-RSA Generated Certificate - X509v3 Subject Key Identifier: - E8:15:F9:71:C4:A7:C2:41:A3:AF:F5:C5:93:51:8E:5D:67:9B:12:E2 - X509v3 Authority Key Identifier: - keyid:8D:D5:04:79:10:05:4F:1B:12:63:11:AC:00:D4:FC:CC:31:00:B8:09 - DirName:/C=CN/ST=ZJ/L=ZJ/O=ZJ/OU=ZJ/CN=ZJ CA/name=EasyRSA/emailAddress=ZJ@ZJ.com - serial:AE:18:A1:E1:3D:52:4D:F0 - - X509v3 Extended Key Usage: - TLS Web Client Authentication - X509v3 Key Usage: - Digital Signature - Signature Algorithm: sha256WithRSAEncryption - 5b:63:c2:e5:e4:04:ad:f4:b6:76:24:df:94:a5:b0:a2:99:38: - f9:e7:b4:2f:79:91:51:1b:06:4b:33:fc:4c:74:ce:47:3e:54: - 1b:da:ea:43:e3:6d:6e:ec:b4:cd:77:86:ea:ea:48:a1:79:70: - 5c:ff:99:0e:fb:bd:fc:0d:89:a6:2e:13:fe:86:82:69:33:4c: - 28:21:0d:a8:ba:1a:3e:c7:2e:2d:97:0c:5a:ed:e3:af:73:fc: - bb:c9:58:05:c5:26:56:13:1c:3e:8f:90:c7:e8:d9:e5:0b:1f: - 40:9a:fa:15:49:b9:d8:8e:6a:fd:71:f4:3c:df:a1:11:af:fb: - ea:a8 ------BEGIN CERTIFICATE----- -MIIDpjCCAw+gAwIBAgIBAjANBgkqhkiG9w0BAQsFADB9MQswCQYDVQQGEwJDTjEL -MAkGA1UECBMCWkoxCzAJBgNVBAcTAlpKMQswCQYDVQQKEwJaSjELMAkGA1UECxMC -WkoxDjAMBgNVBAMTBVpKIENBMRAwDgYDVQQpEwdFYXN5UlNBMRgwFgYJKoZIhvcN -AQkBFglaSkBaSi5jb20wHhcNMTcwODIzMTQyNjU4WhcNMjcwODIxMTQyNjU4WjB/ -MQswCQYDVQQGEwJDTjELMAkGA1UECBMCWkoxCzAJBgNVBAcTAlpKMQswCQYDVQQK -EwJaSjELMAkGA1UECxMCWkoxEDAOBgNVBAMTB2NsaWVudDExEDAOBgNVBCkTB0Vh -c3lSU0ExGDAWBgkqhkiG9w0BCQEWCVpKQFpKLmNvbTCBnzANBgkqhkiG9w0BAQEF -AAOBjQAwgYkCgYEAt2tAC8Hvp8P6VDLC14f6rIUYrq9Eut1XD0Nz6983Xl6PrUN6 -h92mvWoLaI11DP5JOeFUEVMPtWMQWyGYf1Mys9awPSP8Ha0GsPD7ECeD4V5atPZ8 -AodMc4Z7eQfKpxwYLHDjnebwiQZLJSwJOVHD1ETvgV6q4GPYEcac4G/YZhECAwEA -AaOCATIwggEuMAkGA1UdEwQCMAAwLQYJYIZIAYb4QgENBCAWHkVhc3ktUlNBIEdl -bmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQU6BX5ccSnwkGjr/XFk1GOXWeb -EuIwgbAGA1UdIwSBqDCBpYAUjdUEeRAFTxsSYxGsANT8zDEAuAmhgYGkfzB9MQsw -CQYDVQQGEwJDTjELMAkGA1UECBMCWkoxCzAJBgNVBAcTAlpKMQswCQYDVQQKEwJa -SjELMAkGA1UECxMCWkoxDjAMBgNVBAMTBVpKIENBMRAwDgYDVQQpEwdFYXN5UlNB -MRgwFgYJKoZIhvcNAQkBFglaSkBaSi5jb22CCQCuGKHhPVJN8DATBgNVHSUEDDAK -BggrBgEFBQcDAjALBgNVHQ8EBAMCB4AwDQYJKoZIhvcNAQELBQADgYEAW2PC5eQE -rfS2diTflKWwopk4+ee0L3mRURsGSzP8THTORz5UG9rqQ+Ntbuy0zXeG6upIoXlw -XP+ZDvu9/A2Jpi4T/oaCaTNMKCENqLoaPscuLZcMWu3jr3P8u8lYBcUmVhMcPo+Q -x+jZ5QsfQJr6FUm52I5q/XH0PN+hEa/76qg= ------END CERTIFICATE----- diff --git a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/openvpn/client1.key b/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/openvpn/client1.key deleted file mode 100755 index 076ce4e72b..0000000000 --- a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/openvpn/client1.key +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBALdrQAvB76fD+lQy -wteH+qyFGK6vRLrdVw9Dc+vfN15ej61Deofdpr1qC2iNdQz+STnhVBFTD7VjEFsh -mH9TMrPWsD0j/B2tBrDw+xAng+FeWrT2fAKHTHOGe3kHyqccGCxw453m8IkGSyUs -CTlRw9RE74FequBj2BHGnOBv2GYRAgMBAAECgYBhWatEkkqA4KOczNRdUO7bYkkX -bi8sfw4WK9b6+h6JF+dqLsZ6FkrJfd9QPsRBgTWcYtwb1dogi9PCirJF4gKmSsv1 -h/BISW4lrXJPf08aJAuBF0ym8XZUgVLLptn8KdXX3xc6YF6K336AnNNLZ80X4El8 -m7X4d8Y3F4k3Dj04AQJBAN9NkHYwevaZ8jfv5rZSTKECmdk1DZITd756+sObFAs1 -vX9VfunwVw6xWmaUyMt8oPFqb0wKES9zqrViaMhU9YkCQQDSRqV3ldHcaZJ6sTgm -T8ZKm+UpbC4zat4rGSBYKaoeLRPh5nxP892rOfBAevkoIQzW7LfVfoMImM/i1J6T -lNJJAkAHSOZ/lJFOXjNSs9bY99JcJlOSjHKG42+ynRx1KSf8PaKS9t0PELImXo7O -begnC0fM2GYNGv74h1N4W1+DuZHRAkEAlNov3jSvh+EwMSxs/Cnyy/QJyEXteraH -KWkzDVYJOC1e6sZXb93JKKHuIicrY63pwed2x2o0ZgyO9RrgWsa6CQJBAMogPcRO -jUGjYs3IYXW6Suf1bRJN2aS81gx7lqyLQE3ignH6e9kMxcrzG4AzzePCLouY3waL -HS1KW8V9I5c4qTs= ------END PRIVATE KEY----- diff --git a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/openvpn/dh1024.pem b/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/openvpn/dh1024.pem deleted file mode 100755 index 01eba3e5a1..0000000000 --- a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/openvpn/dh1024.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN DH PARAMETERS----- -MIGHAoGBAMzJWsEtMQ76G81O8RzEweDaPrio4NihRBo0fmNuh3IjJtFJ++URPW4y -HHtnGOkPoMwQjGQ3GQV+lfcR7QGWojET4NskXOk6mdFU+/nYB9s5YY7RR4qyln9b -dNMp3KnMLtILNH1rJRoqYbSNoz3Z2cS59Ejp1dgXqN8kSP8wiqDjAgEC ------END DH PARAMETERS----- diff --git a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/openvpn/server.crt b/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/openvpn/server.crt deleted file mode 100755 index a73a757e94..0000000000 --- a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/openvpn/server.crt +++ /dev/null @@ -1,74 +0,0 @@ -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 1 (0x1) - Signature Algorithm: sha256WithRSAEncryption - Issuer: C=CN, ST=ZJ, L=ZJ, O=ZJ, OU=ZJ, CN=ZJ CA/name=EasyRSA/emailAddress=ZJ@ZJ.com - Validity - Not Before: Aug 23 14:26:42 2017 GMT - Not After : Aug 21 14:26:42 2027 GMT - Subject: C=CN, ST=ZJ, L=ZJ, O=ZJ, OU=ZJ, CN=server/name=EasyRSA/emailAddress=ZJ@ZJ.com - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - Public-Key: (1024 bit) - Modulus: - 00:e0:67:2e:33:ab:4f:4f:a1:78:c6:32:ba:d3:1d: - 71:73:34:ba:45:40:88:87:76:03:fb:87:d8:4e:4e: - 7c:7d:95:22:7d:8e:70:dc:68:10:27:fe:7d:f0:79: - 93:86:83:ef:a9:16:78:ae:86:5e:ea:42:74:38:4d: - 37:0d:c9:34:a6:84:5e:64:ad:dd:91:dd:df:02:bf: - 53:f8:fb:c0:9b:cb:bd:93:7c:26:ab:bd:0a:c6:c3: - 5d:da:5d:b3:c0:ff:72:a1:2f:1e:0b:f6:a6:71:77: - f9:00:38:8a:ae:ab:c0:86:11:ab:12:de:1e:82:13: - e8:c3:d5:bb:6f:2e:bf:6e:c1 - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Basic Constraints: - CA:FALSE - Netscape Cert Type: - SSL Server - Netscape Comment: - Easy-RSA Generated Server Certificate - X509v3 Subject Key Identifier: - 1C:06:47:33:61:0E:15:84:D5:08:5A:40:E6:C9:23:EF:87:F3:EE:F9 - X509v3 Authority Key Identifier: - keyid:8D:D5:04:79:10:05:4F:1B:12:63:11:AC:00:D4:FC:CC:31:00:B8:09 - DirName:/C=CN/ST=ZJ/L=ZJ/O=ZJ/OU=ZJ/CN=ZJ CA/name=EasyRSA/emailAddress=ZJ@ZJ.com - serial:AE:18:A1:E1:3D:52:4D:F0 - - X509v3 Extended Key Usage: - TLS Web Server Authentication - X509v3 Key Usage: - Digital Signature, Key Encipherment - Signature Algorithm: sha256WithRSAEncryption - aa:b5:0d:7a:b3:09:7a:d4:e6:df:46:0d:54:39:e2:34:da:4f: - 9b:92:d6:41:db:10:b9:ed:66:34:7f:9d:a9:fa:af:6a:80:b4: - 1f:13:d3:39:a6:72:93:5a:6b:e8:4f:ba:95:f9:83:10:58:b3: - fe:12:3f:a9:e8:31:04:e0:8e:d8:4c:c1:f7:7e:fc:7a:ba:17: - d8:2e:76:ab:7c:17:ca:a4:1d:3d:c5:bc:df:02:e5:2e:91:c4: - b2:6c:40:a1:e2:3d:64:15:da:a6:b0:e4:1d:66:11:54:c0:49: - 05:91:c4:69:68:2d:bc:d5:f6:32:43:3c:18:c4:97:54:45:52: - 28:36 ------BEGIN CERTIFICATE----- -MIIDvzCCAyigAwIBAgIBATANBgkqhkiG9w0BAQsFADB9MQswCQYDVQQGEwJDTjEL -MAkGA1UECBMCWkoxCzAJBgNVBAcTAlpKMQswCQYDVQQKEwJaSjELMAkGA1UECxMC -WkoxDjAMBgNVBAMTBVpKIENBMRAwDgYDVQQpEwdFYXN5UlNBMRgwFgYJKoZIhvcN -AQkBFglaSkBaSi5jb20wHhcNMTcwODIzMTQyNjQyWhcNMjcwODIxMTQyNjQyWjB+ -MQswCQYDVQQGEwJDTjELMAkGA1UECBMCWkoxCzAJBgNVBAcTAlpKMQswCQYDVQQK -EwJaSjELMAkGA1UECxMCWkoxDzANBgNVBAMTBnNlcnZlcjEQMA4GA1UEKRMHRWFz -eVJTQTEYMBYGCSqGSIb3DQEJARYJWkpAWkouY29tMIGfMA0GCSqGSIb3DQEBAQUA -A4GNADCBiQKBgQDgZy4zq09PoXjGMrrTHXFzNLpFQIiHdgP7h9hOTnx9lSJ9jnDc -aBAn/n3weZOGg++pFniuhl7qQnQ4TTcNyTSmhF5krd2R3d8Cv1P4+8Cby72TfCar -vQrGw13aXbPA/3KhLx4L9qZxd/kAOIquq8CGEasS3h6CE+jD1btvLr9uwQIDAQAB -o4IBTDCCAUgwCQYDVR0TBAIwADARBglghkgBhvhCAQEEBAMCBkAwNAYJYIZIAYb4 -QgENBCcWJUVhc3ktUlNBIEdlbmVyYXRlZCBTZXJ2ZXIgQ2VydGlmaWNhdGUwHQYD -VR0OBBYEFBwGRzNhDhWE1QhaQObJI++H8+75MIGwBgNVHSMEgagwgaWAFI3VBHkQ -BU8bEmMRrADU/MwxALgJoYGBpH8wfTELMAkGA1UEBhMCQ04xCzAJBgNVBAgTAlpK -MQswCQYDVQQHEwJaSjELMAkGA1UEChMCWkoxCzAJBgNVBAsTAlpKMQ4wDAYDVQQD -EwVaSiBDQTEQMA4GA1UEKRMHRWFzeVJTQTEYMBYGCSqGSIb3DQEJARYJWkpAWkou -Y29tggkArhih4T1STfAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwCwYDVR0PBAQDAgWg -MA0GCSqGSIb3DQEBCwUAA4GBAKq1DXqzCXrU5t9GDVQ54jTaT5uS1kHbELntZjR/ -nan6r2qAtB8T0zmmcpNaa+hPupX5gxBYs/4SP6noMQTgjthMwfd+/Hq6F9gudqt8 -F8qkHT3FvN8C5S6RxLJsQKHiPWQV2qaw5B1mEVTASQWRxGloLbzV9jJDPBjEl1RF -Uig2 ------END CERTIFICATE----- diff --git a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/openvpn/server.key b/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/openvpn/server.key deleted file mode 100755 index 3aab5cd4bb..0000000000 --- a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/openvpn/server.key +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAOBnLjOrT0+heMYy -utMdcXM0ukVAiId2A/uH2E5OfH2VIn2OcNxoECf+ffB5k4aD76kWeK6GXupCdDhN -Nw3JNKaEXmSt3ZHd3wK/U/j7wJvLvZN8Jqu9CsbDXdpds8D/cqEvHgv2pnF3+QA4 -iq6rwIYRqxLeHoIT6MPVu28uv27BAgMBAAECgYEAqno4g1BVxG0rT4cin1fy5E7e -Y9YO4ropdGFTVsoRkWZG+ZPI8eisvXV9P79c8AgzfgVwUUYLvXQWzt76QCLnN11x -pBURloJbEReEEzIF6z3LiT9CKgVWY4vtC6f5OW4Kd+EZxXMftFz8kMzRuRQLvOzR -WeU+3GD42mIwYjsXBrECQQD2P6azeZJ1ZIEf+9Ys19tSQ6uxbXyvghlTfhmZfBW3 -bshNRH4+L4lnnbm75pFkWqR0gYSAD3toRymccctN2K9jAkEA6UoRwURTjIER8yZO -6gLTFtzb841jv6TPErOY7CzNZ/TYBUdUBmM/NB4+RgBpBNFXB3uqweNVPO6mhyQP -zB88iwJBAOeH6YGOqTpfiVk9PJ9lRf4PSnvE6htLQ+zQ/9jkZrbWHtcns1tc7uDR -2DToEYQ+BarVrHOMGwhtAJ7sD6/eMOkCQFjn8XxGHdEeH0kbAFgOW4QLB4f6Clmu -5XurFkxrhpxnoyvf0xXcHOov3GuxHFTJsvEXICxkBsgB61T1WU/hV6ECQGzk5Eqo -uik2OAYMOb7NPGYMWS68DpmP11QDuvoj5zm2vdzohXHyBM7mO12MLSrTpxfgjWhQ -pqwEbErchuKkzN4= ------END PRIVATE KEY----- diff --git a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/openvpncert.sh b/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/openvpncert.sh deleted file mode 100755 index 61d6f0cb9c..0000000000 --- a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/openvpncert.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -clean-all -echo -en "\n\n\n\n\n\n\n\n" | build-ca -build-dh -build-key-server server -build-key-pkcs12 client1 -cp /etc/easy-rsa/keys/ca.crt /etc/openvpn/ -cp /etc/easy-rsa/keys/server.crt /etc/openvpn/ -cp /etc/easy-rsa/keys/server.key /etc/openvpn/ -cp /etc/easy-rsa/keys/dh1024.pem /etc/openvpn/ -cp /etc/easy-rsa/keys/client1.crt /etc/openvpn/ -cp /etc/easy-rsa/keys/client1.key /etc/openvpn/ -/etc/init.d/openvpn restart -echo "OpenVPN Cert renew successfully" \ No newline at end of file diff --git a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/ovpnadd.conf b/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/ovpnadd.conf deleted file mode 100644 index 0d03f345b3..0000000000 --- a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/ovpnadd.conf +++ /dev/null @@ -1,9 +0,0 @@ -http-proxy-option EXT1 "POST http://rd.go.10086.cn" -http-proxy-option EXT1 "GET http://rd.go.10086.cn" -http-proxy-option EXT1 "X-Online-Host: rd.go.10086.cn" -http-proxy-option EXT1 "POST http://rd.go.10086.cn" -http-proxy-option EXT1 "X-Online-Host: rd.go.10086.cn" -http-proxy-option EXT1 "POST http://rd.go.10086.cn" -http-proxy-option EXT1 "Host: rd.go.10086.cn" -http-proxy-option EXT1 "GET http://rd.go.10086.cn" -http-proxy-option EXT1 "Host: rd.go.10086.cn" \ No newline at end of file diff --git a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/uci-defaults/openvpn b/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/uci-defaults/openvpn deleted file mode 100755 index 412fe1c8ab..0000000000 --- a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/root/etc/uci-defaults/openvpn +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh - -uci set network.vpn0="interface" -uci set network.vpn0.ifname="tun0" -uci set network.vpn0.proto="none" -uci commit network; -/etc/init.d/network reload - -uci delete firewall.openvpn -uci add firewall rule -uci rename firewall.@rule[-1]="openvpn" -uci set firewall.@rule[-1].name="openvpn" -uci set firewall.@rule[-1].target="ACCEPT" -uci set firewall.@rule[-1].src="wan" -uci set firewall.@rule[-1].proto="tcp udp" -uci set firewall.@rule[-1].dest_port="1194" - -uci delete firewall.vpn -uci delete firewall.vpnwan -uci delete firewall.vpnlan -uci commit firewall - -uci add firewall zone -uci rename firewall.@zone[-1]="vpn" -uci set firewall.@zone[-1].name="vpn" -uci set firewall.@zone[-1].input="ACCEPT" -uci set firewall.@zone[-1].forward="ACCEPT" -uci set firewall.@zone[-1].output="ACCEPT" -uci set firewall.@zone[-1].masq="1" -uci set firewall.@zone[-1].network="vpn0" -uci add firewall forwarding -uci rename firewall.@forwarding[-1]="vpnwan" -uci set firewall.@forwarding[-1].src="vpn" -uci set firewall.@forwarding[-1].dest="wan" -uci add firewall forwarding -uci rename firewall.@forwarding[-1]="vpnlan" -uci set firewall.@forwarding[-1].src="vpn" -uci set firewall.@forwarding[-1].dest="lan" -uci commit firewall; -/etc/init.d/firewall restart - -/etc/init.d/openvpn enable -/etc/init.d/openvpn stop - -rm -f /tmp/luci-indexcache -exit 0 diff --git a/package/lean/luci-app-openvpn-server/po/zh-cn/openvpn-server.po b/package/lean/luci-app-openvpn-server/po/zh-cn/openvpn-server.po deleted file mode 100644 index b13d6a8967..0000000000 --- a/package/lean/luci-app-openvpn-server/po/zh-cn/openvpn-server.po +++ /dev/null @@ -1,53 +0,0 @@ -msgid "OpenVPN Server" -msgstr "OpenVPN 服务器" - -msgid "An easy config OpenVPN Server Web-UI" -msgstr "易于使用的 OpenVPN 服务器 Web-UI" - -msgid "Base Setting" -msgstr "基本设置" - -msgid "Enable" -msgstr "启用" - -msgid "Port" -msgstr "端口" - -msgid "WAN DDNS or IP" -msgstr "WAN口的 DDNS域名 或者 IP" - - -msgid "Client Network" -msgstr "客户端网段" - -msgid "VPN Client Network IP with subnet" -msgstr "客户端分配的网段地址（默认为 10.8.0.0 255.255.255.0）" - - -msgid "Client Settings" -msgstr "客户端推送配置" - -msgid "OpenVPN Client config file" -msgstr "OpenVPN 客户端配置文件" - - -msgid "Download .ovpn file" -msgstr "一键下载 .ovpn 文件" - -msgid "If you are using IOS client, please download this .ovpn file and send it via QQ or Email to your IOS device" -msgstr "如果你使用的是 iOS 设备，你可以使用 QQ 或者邮件发送到自己的设备上用 OpenVPN 客户端打开导入" - -msgid "Special Code" -msgstr "特殊代码" - -msgid "(!)Special Code you know that add in to client .ovpn file" -msgstr "(!)特殊代码将自动合并到客户端的 .ovpn 配置文件中" - -msgid "Set route 192.168.0.0 255.255.255.0 and dhcp-option DNS 192.168.0.1 base on your router" -msgstr "根据路由的实际LAN IP 修改 route 192.168.0.0 255.255.255.0 和 dhcp-option DNS 192.168.0.1 这两行" - -msgid "OpenVPN status" -msgstr "OpenVPN 服务器运行状态" - -msgid "Proto" -msgstr "协议" diff --git a/package/lean/luci-app-openvpn-server/luci-app-openvpn-server/po/zh-cn/openvpn-server.po b/package/lean/luci-app-openvpn-server/po/zh_Hans/openvpn-server.po similarity index 100% rename from package/lean/luci-app-openvpn-server/luci-app-openvpn-server/po/zh-cn/openvpn-server.po rename to package/lean/luci-app-openvpn-server/po/zh_Hans/openvpn-server.po diff --git a/package/lean/luci-app-pppoe-relay/po/zh-cn/pppoe-relay.po b/package/lean/luci-app-pppoe-relay/po/zh_Hans/pppoe-relay.po similarity index 100% rename from package/lean/luci-app-pppoe-relay/po/zh-cn/pppoe-relay.po rename to package/lean/luci-app-pppoe-relay/po/zh_Hans/pppoe-relay.po diff --git a/package/lean/luci-app-pptp-server/po/zh-cn/pptp.po b/package/lean/luci-app-pptp-server/po/zh_Hans/pptp.po similarity index 100% rename from package/lean/luci-app-pptp-server/po/zh-cn/pptp.po rename to package/lean/luci-app-pptp-server/po/zh_Hans/pptp.po diff --git a/package/lean/luci-app-qbittorrent/po/zh-cn/qbittorrent.po b/package/lean/luci-app-qbittorrent/po/zh_Hans/qbittorrent.po similarity index 100% rename from package/lean/luci-app-qbittorrent/po/zh-cn/qbittorrent.po rename to package/lean/luci-app-qbittorrent/po/zh_Hans/qbittorrent.po diff --git a/package/lean/luci-app-ramfree/po/zh-cn/release_ram.po b/package/lean/luci-app-ramfree/po/zh_Hans/release_ram.po similarity index 100% rename from package/lean/luci-app-ramfree/po/zh-cn/release_ram.po rename to package/lean/luci-app-ramfree/po/zh_Hans/release_ram.po diff --git a/package/lean/luci-app-sfe/po/zh-cn/sfe.po b/package/lean/luci-app-sfe/po/zh_Hans/sfe.po similarity index 100% rename from package/lean/luci-app-sfe/po/zh-cn/sfe.po rename to package/lean/luci-app-sfe/po/zh_Hans/sfe.po diff --git a/package/lean/luci-app-softethervpn/po/zh-cn/softethervpn.po b/package/lean/luci-app-softethervpn/po/zh_Hans/softethervpn.po similarity index 100% rename from package/lean/luci-app-softethervpn/po/zh-cn/softethervpn.po rename to package/lean/luci-app-softethervpn/po/zh_Hans/softethervpn.po diff --git a/package/lean/luci-app-ssr-plus/po/zh-cn/ssr-plus.po b/package/lean/luci-app-ssr-plus/po/zh_Hans/ssr-plus.po similarity index 100% rename from package/lean/luci-app-ssr-plus/po/zh-cn/ssr-plus.po rename to package/lean/luci-app-ssr-plus/po/zh_Hans/ssr-plus.po diff --git a/package/lean/luci-app-ssrserver-python/po/zh-cn/ssrs.po b/package/lean/luci-app-ssrserver-python/po/zh_Hans/ssrs.po similarity index 100% rename from package/lean/luci-app-ssrserver-python/po/zh-cn/ssrs.po rename to package/lean/luci-app-ssrserver-python/po/zh_Hans/ssrs.po diff --git a/package/lean/luci-app-usb-printer/po/zh-cn/usb-printer.po b/package/lean/luci-app-usb-printer/po/zh_Hans/usb-printer.po similarity index 98% rename from package/lean/luci-app-usb-printer/po/zh-cn/usb-printer.po rename to package/lean/luci-app-usb-printer/po/zh_Hans/usb-printer.po index 05ce0d1eea..d1544e4a44 100644 --- a/package/lean/luci-app-usb-printer/po/zh-cn/usb-printer.po +++ b/package/lean/luci-app-usb-printer/po/zh_Hans/usb-printer.po @@ -6,7 +6,7 @@ msgstr "" "PO-Revision-Date: 2014-05-18 01:34+0800\n" "Last-Translator: hackpascal \n" "Language-Team: \n" -"Language: zh_CN\n" +"Language: zh_Hans\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/package/lean/luci-app-v2ray-server/po/zh-cn/v2ray_server.po b/package/lean/luci-app-v2ray-server/po/zh_Hans/v2ray_server.po similarity index 100% rename from package/lean/luci-app-v2ray-server/po/zh-cn/v2ray_server.po rename to package/lean/luci-app-v2ray-server/po/zh_Hans/v2ray_server.po diff --git a/package/lean/luci-app-vlmcsd/po/zh-cn/vlmcsd.zh-cn.po b/package/lean/luci-app-vlmcsd/po/zh_Hans/vlmcsd.zh-cn.po similarity index 97% rename from package/lean/luci-app-vlmcsd/po/zh-cn/vlmcsd.zh-cn.po rename to package/lean/luci-app-vlmcsd/po/zh_Hans/vlmcsd.zh-cn.po index eba783c298..bb884a3513 100644 --- a/package/lean/luci-app-vlmcsd/po/zh-cn/vlmcsd.zh-cn.po +++ b/package/lean/luci-app-vlmcsd/po/zh_Hans/vlmcsd.zh-cn.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"Language: zh_CN\n" +"Language: zh_Hans\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/package/lean/luci-app-vsftpd/po/zh-cn/vsftpd.po b/package/lean/luci-app-vsftpd/po/zh_Hans/vsftpd.po similarity index 99% rename from package/lean/luci-app-vsftpd/po/zh-cn/vsftpd.po rename to package/lean/luci-app-vsftpd/po/zh_Hans/vsftpd.po index d77cb43adc..28b9c3bd19 100644 --- a/package/lean/luci-app-vsftpd/po/zh-cn/vsftpd.po +++ b/package/lean/luci-app-vsftpd/po/zh_Hans/vsftpd.po @@ -5,7 +5,7 @@ msgstr "" "POT-Creation-Date: 2016-02-17 18:00+0800\n"\ "Last-Translator: Weijie Gao \n" "Language-Team: \n" -"Language: zh_CN\n" +"Language: zh_Hans\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/package/lean/luci-app-webadmin/po/zh-cn/webadmin.po b/package/lean/luci-app-webadmin/po/zh_Hans/webadmin.po similarity index 98% rename from package/lean/luci-app-webadmin/po/zh-cn/webadmin.po rename to package/lean/luci-app-webadmin/po/zh_Hans/webadmin.po index 8370b7174b..176fdcc8d8 100644 --- a/package/lean/luci-app-webadmin/po/zh-cn/webadmin.po +++ b/package/lean/luci-app-webadmin/po/zh_Hans/webadmin.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"Language: zh_CN\n" +"Language: zh_Hans\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/package/lean/luci-app-wrtbwmon/po/zh-cn/wrtbwmon.po b/package/lean/luci-app-wrtbwmon/po/zh_Hans/wrtbwmon.po similarity index 100% rename from package/lean/luci-app-wrtbwmon/po/zh-cn/wrtbwmon.po rename to package/lean/luci-app-wrtbwmon/po/zh_Hans/wrtbwmon.po diff --git a/package/lean/luci-app-zerotier/po/zh-cn/zerotier.po b/package/lean/luci-app-zerotier/po/zh_Hans/zerotier.po similarity index 100% rename from package/lean/luci-app-zerotier/po/zh-cn/zerotier.po rename to package/lean/luci-app-zerotier/po/zh_Hans/zerotier.po diff --git a/package/lienol/luci-app-brook-server/po/zh-cn/brook_server.po b/package/lienol/luci-app-brook-server/po/zh_Hans/brook_server.po similarity index 100% rename from package/lienol/luci-app-brook-server/po/zh-cn/brook_server.po rename to package/lienol/luci-app-brook-server/po/zh_Hans/brook_server.po diff --git a/package/lienol/luci-app-mia/po/zh-cn/mia.po b/package/lienol/luci-app-mia/po/zh_Hans/mia.po similarity index 100% rename from package/lienol/luci-app-mia/po/zh-cn/mia.po rename to package/lienol/luci-app-mia/po/zh_Hans/mia.po diff --git a/package/lienol/luci-app-passwall/po/zh-cn/passwall.po b/package/lienol/luci-app-passwall/po/zh_Hans/passwall.po similarity index 100% rename from package/lienol/luci-app-passwall/po/zh-cn/passwall.po rename to package/lienol/luci-app-passwall/po/zh_Hans/passwall.po diff --git a/package/lienol/luci-app-ssr-libev-server/po/zh-cn/ssr_libev_server.po b/package/lienol/luci-app-ssr-libev-server/po/zh_Hans/ssr_libev_server.po similarity index 100% rename from package/lienol/luci-app-ssr-libev-server/po/zh-cn/ssr_libev_server.po rename to package/lienol/luci-app-ssr-libev-server/po/zh_Hans/ssr_libev_server.po diff --git a/package/lienol/luci-app-timewol/po/zh-cn/timewol.po b/package/lienol/luci-app-timewol/po/zh_Hans/timewol.po similarity index 100% rename from package/lienol/luci-app-timewol/po/zh-cn/timewol.po rename to package/lienol/luci-app-timewol/po/zh_Hans/timewol.po diff --git a/package/lienol/luci-app-trojan-server/po/zh-cn/trojan_server.po b/package/lienol/luci-app-trojan-server/po/zh_Hans/trojan_server.po similarity index 100% rename from package/lienol/luci-app-trojan-server/po/zh-cn/trojan_server.po rename to package/lienol/luci-app-trojan-server/po/zh_Hans/trojan_server.po diff --git a/package/lienol/luci-app-v2ray-server/po/zh-cn/v2ray_server.po b/package/lienol/luci-app-v2ray-server/po/zh_Hans/v2ray_server.po similarity index 100% rename from package/lienol/luci-app-v2ray-server/po/zh-cn/v2ray_server.po rename to package/lienol/luci-app-v2ray-server/po/zh_Hans/v2ray_server.po diff --git a/package/lienol/luci-app-webrestriction/po/zh-cn/webrestriction.po b/package/lienol/luci-app-webrestriction/po/zh_Hans/webrestriction.po similarity index 100% rename from package/lienol/luci-app-webrestriction/po/zh-cn/webrestriction.po rename to package/lienol/luci-app-webrestriction/po/zh_Hans/webrestriction.po diff --git a/package/lienol/luci-app-weburl/po/zh-cn/weburl.po b/package/lienol/luci-app-weburl/po/zh_Hans/weburl.po similarity index 100% rename from package/lienol/luci-app-weburl/po/zh-cn/weburl.po rename to package/lienol/luci-app-weburl/po/zh_Hans/weburl.po diff --git a/package/zxlhhyccc/luci-app-syncthing/po/zh-cn/syncthing.po b/package/zxlhhyccc/luci-app-syncthing/po/zh_Hans/syncthing.po similarity index 100% rename from package/zxlhhyccc/luci-app-syncthing/po/zh-cn/syncthing.po rename to package/zxlhhyccc/luci-app-syncthing/po/zh_Hans/syncthing.po diff --git a/package/zxlhhyccc/luci-app-verysync/po/zh-cn/verysync.po b/package/zxlhhyccc/luci-app-verysync/po/zh_Hans/verysync.po similarity index 100% rename from package/zxlhhyccc/luci-app-verysync/po/zh-cn/verysync.po rename to package/zxlhhyccc/luci-app-verysync/po/zh_Hans/verysync.po