diff --git a/luci-app-wechatpush/Makefile b/luci-app-wechatpush/Makefile index 6c438a79..89c8278e 100755 --- a/luci-app-wechatpush/Makefile +++ b/luci-app-wechatpush/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-wechatpush PKG_VERSION:=3.6.12 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=tty228 PKG_CONFIG_DEPENDS:= \ diff --git a/luci-app-wechatpush/htdocs/luci-static/resources/view/wechatpush/advanced.js b/luci-app-wechatpush/htdocs/luci-static/resources/view/wechatpush/advanced.js index 1415a4ca..28f08e09 100644 --- a/luci-app-wechatpush/htdocs/luci-static/resources/view/wechatpush/advanced.js +++ b/luci-app-wechatpush/htdocs/luci-static/resources/view/wechatpush/advanced.js @@ -106,6 +106,8 @@ return view.extend({ o.rmempty = true o.default = "22" o.description = _('The default SSH port is 22. If you have a custom port, please fill in the custom SSH port.
Please make sure you have set up key-based login, otherwise it may cause script errors.
Install the sensors command on PVE by searching on the internet.
Example for key-based login (modify the address and port number accordingly):
opkg update # Update package list
opkg install openssh-client openssh-keygen # Install openssh client
echo -e \"\\n\" | ssh-keygen -t rsa # Generate key file (no passphrase)
pve_host=`uci get wechatpush.config.server_host` || pve_host=\"10.0.0.3\" # Read the PVE host address from the configuration file, If not saved, please fill in by yourself.
pve_port=`uci get wechatpush.config.server_port` || pve_host=\"22\" # Read the PVE host SSH port number from the configuration file, If not saved, please fill in by yourself.
ssh -o StrictHostKeyChecking=yes root@${pve_host} -p ${pve_port} \"tee -a ~/.ssh/OpenWrt_id_rsa.pub\" < ~/.ssh/id_rsa.pub # Transfer public key to PVE
ssh root@${pve_host} -p ${pve_port} \"cat ~/.ssh/OpenWrt_id_rsa.pub >> ~/.ssh/authorized_keys\" # Write public key to PVE
ssh -i /root/.ssh/id_rsa root@${pve_host} -p ${pve_port} sensors # To avoid script errors during the initial connection, please use a private key to connect to PVE and test the temperature command for its proper functioning.
For users who frequently flash firmware, please add /root/.ssh/ to the backup list to avoid duplicate operations.'); + + // cat ~/.ssh/id_rsa.pub | ssh -o PreferredAuthentications=password -o PubkeyAuthentication=no -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null root@${pve_host} -p ${pve_port} "cat >> ~/.ssh/authorized_keys" o.depends('soc_code', 'pve'); o = s.option(form.Button, '_soc', _('Test temperature command'), _('You may need to save the configuration before sending.')); diff --git a/mtproxy/Makefile b/mtproxy/Makefile index 1e7e64c9..4b547eb8 100644 --- a/mtproxy/Makefile +++ b/mtproxy/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mtproxy -PKG_VERSION:=3.0.12 -PKG_RELEASE:=3 +PKG_VERSION:=3.0.13 +PKG_RELEASE:=4 PKG_MAINTAINER:=Kosntantine Shevlakov PKG_LICENSE:=GPLv2 @@ -10,7 +10,7 @@ PKG_LICENSE_FILES:=LICENSE PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/GetPageSpeed/MTProxy.git -PKG_SOURCE_VERSION:=92f9252c64d22ca907d8dbcd2885f6337ba9fa0d +PKG_SOURCE_VERSION:=98753de0380acf52a6f54c1e41c0d6939d5d05e7 PKG_SOURCE_SUBDIR:=$(PKG_NAME) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz