update 2024-12-17 04:23:32

This commit is contained in:
kenzok8 2024-12-17 04:23:32 +08:00
parent 141ca86d8e
commit 062e0d2598
9 changed files with 41 additions and 34 deletions

View File

@ -21,16 +21,16 @@ Internet-detector is an application for checking the availability of the Interne
/etc/init.d/internet-detector start
/etc/init.d/internet-detector enable
wget --no-check-certificate -O /tmp/luci-app-internet-detector_1.3.1-r2_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/current/luci-app-internet-detector_1.3.1-r2_all.ipk
opkg install /tmp/luci-app-internet-detector_1.3.1-r2_all.ipk
rm /tmp/luci-app-internet-detector_1.3.1-r2_all.ipk
wget --no-check-certificate -O /tmp/luci-app-internet-detector_1.3.1-1_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/current/luci-app-internet-detector_1.3.1-1_all.ipk
opkg install /tmp/luci-app-internet-detector_1.3.1-1_all.ipk
rm /tmp/luci-app-internet-detector_1.3.1-1_all.ipk
/etc/init.d/rpcd restart
i18n-ru:
wget --no-check-certificate -O /tmp/luci-i18n-internet-detector-ru_1.3.1-r2_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/current/luci-i18n-internet-detector-ru_1.3.1-r2_all.ipk
opkg install /tmp/luci-i18n-internet-detector-ru_1.3.1-r2_all.ipk
rm /tmp/luci-i18n-internet-detector-ru_1.3.1-r2_all.ipk
wget --no-check-certificate -O /tmp/luci-i18n-internet-detector-ru_1.3.1-1_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/current/luci-i18n-internet-detector-ru_1.3.1-1_all.ipk
opkg install /tmp/luci-i18n-internet-detector-ru_1.3.1-1_all.ipk
rm /tmp/luci-i18n-internet-detector-ru_1.3.1-1_all.ipk
## Screenshots:

View File

@ -17,7 +17,6 @@ define Package/$(PKG_NAME)
TITLE:=Email module for internet-detector
URL:=https://github.com/gSpotx2f/luci-app-internet-detector
PKGARCH:=all
#PKGARCH:=noarch
DEPENDS:=+internet-detector +mailsend
endef

View File

@ -17,7 +17,6 @@ define Package/$(PKG_NAME)
TITLE:=Modem restart module for internet-detector
URL:=https://github.com/gSpotx2f/luci-app-internet-detector
PKGARCH:=all
#PKGARCH:=noarch
DEPENDS:=+internet-detector +modemmanager
endef

View File

@ -17,7 +17,6 @@ define Package/$(PKG_NAME)
TITLE:=Internet detector
URL:=https://github.com/gSpotx2f/luci-app-internet-detector
PKGARCH:=all
#PKGARCH:=noarch
DEPENDS:=+lua +luaposix +libuci-lua
endef

View File

@ -6,11 +6,10 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-internet-detector
PKG_VERSION:=1.3.1
PKG_RELEASE:=2
PKG_RELEASE:=1
LUCI_TITLE:=LuCI support for internet-detector
LUCI_DEPENDS:=+internet-detector
LUCI_PKGARCH:=all
#LUCI_PKGARCH:=noarch
#include ../../luci.mk
include $(TOPDIR)/feeds/luci/luci.mk

View File

@ -560,11 +560,16 @@ return view.extend({
/* Main settings */
// mode
let mode = s.option(form.RichListValue, 'mode',
let mode = s.option(form.ListValue, 'mode',
_('Internet detector mode'));
mode.value('0', _('Disabled'), _('Detector is completely off.'));
mode.value('1', _('Service'), _('Detector always runs as a system service.'));
mode.value('2', _('Web UI only (UI detector)'), _('Detector works only when the Web UI is open.'));
mode.value('0', _('Disabled'));
mode.value('1', _('Service'));
mode.value('2', _('Web UI only (UI detector)'));
mode.description = '%s<br />%s<br />%s'.format(
_('Disabled: detector is completely off.'),
_('Service: detector always runs as a system service.'),
_('Web UI only: detector works only when the Web UI is open (UI detector).')
);
mode.default = '0';
@ -1120,10 +1125,14 @@ return view.extend({
o.modalonly = true;
// mail_security
o = s.taboption('email', form.RichListValue,
o = s.taboption('email', form.ListValue,
'mod_email_mail_security', _('Security'));
o.value('tls', 'TLS', _('Use STARTTLS if the server supports it.'));
o.value('ssl', 'SSL', _('SMTP over SSL.'));
o.description = '%s<br />%s'.format(
_('TLS: use STARTTLS if the server supports it.'),
_('SSL: SMTP over SSL.'),
);
o.value('tls', 'TLS');
o.value('ssl', 'SSL');
o.default = 'tls';
o.modalonly = true;
} else {

View File

@ -92,8 +92,8 @@ msgstr "Отключить принудительную перезагрузку
msgid "Disabled"
msgstr "Отключен"
msgid "Detector is completely off."
msgstr "Детектор полностью выключен."
msgid "Disabled: detector is completely off."
msgstr "Отключен: детектор полностью выключен."
msgid "Disconnected"
msgstr "Отключен"
@ -353,8 +353,8 @@ msgstr "SMTP-сервер"
msgid "SMTP server port"
msgstr "Порт SMTP-сервера"
msgid "SMTP over SSL."
msgstr "SMTP поверх SSL."
msgid "SSL: SMTP over SSL."
msgstr "SSL: SMTP поверх SSL."
msgid "Save"
msgstr "Сохранить"
@ -380,8 +380,8 @@ msgstr "Конфигурация службы"
msgid "Service for determining the public IP address through DNS."
msgstr "Сервис для определения публичного IP адреса через DNS."
msgid "Detector always runs as a system service."
msgstr "Детектор работает постоянно, как системная служба."
msgid "Service: detector always runs as a system service."
msgstr "Служба: детектор работает постоянно, как системная служба."
msgid "Service instances"
msgstr "Экземпляры службы"
@ -419,8 +419,8 @@ msgstr "Подключение к TCP-порту"
msgid "The type of record requested in the DNS query (if the service supports it)."
msgstr "Тип записи запрашиваемой в DNS-запросе (если сервис поддерживает)."
msgid "Use STARTTLS if the server supports it."
msgstr "Использовать STARTTLS если сервер поддерживает."
msgid "TLS: use STARTTLS if the server supports it."
msgstr "TLS: использовать STARTTLS если сервер поддерживает."
msgid "Timeout between stopping and starting the interface."
msgstr "Таймаут между остановкой и запуском интерфейса."
@ -457,8 +457,10 @@ msgstr ""
msgid "Web UI only (UI detector)"
msgstr "Только web-интерфейс (UI детектор)"
msgid "Detector works only when the Web UI is open."
msgstr "Детектор работает только в web-интерфейсе."
msgid "Web UI only: detector works only when the Web UI is open (UI detector)."
msgstr ""
"Только web-интерфейс: детектор работает только в web-интерфейсе (UI "
"детектор)."
msgid "When email will be sent"
msgstr "Когда будет отправлено сообщение"

View File

@ -80,7 +80,7 @@ msgstr ""
msgid "Disabled"
msgstr ""
msgid "Detector is completely off."
msgid "Disabled: detector is completely off."
msgstr ""
msgid "Disconnected"
@ -328,7 +328,7 @@ msgstr ""
msgid "SMTP server port"
msgstr ""
msgid "SMTP over SSL."
msgid "SSL: SMTP over SSL."
msgstr ""
msgid "Save"
@ -355,7 +355,7 @@ msgstr ""
msgid "Service for determining the public IP address through DNS."
msgstr ""
msgid "Detector always runs as a system service."
msgid "Service: detector always runs as a system service."
msgstr ""
msgid "Service instances"
@ -394,7 +394,7 @@ msgstr ""
msgid "The type of record requested in the DNS query (if the service supports it)."
msgstr ""
msgid "Use STARTTLS if the server supports it."
msgid "TLS: use STARTTLS if the server supports it."
msgstr ""
msgid "Timeout between stopping and starting the interface."
@ -430,7 +430,7 @@ msgstr ""
msgid "Web UI only (UI detector)"
msgstr ""
msgid "Detector works only when the Web UI is open."
msgid "Web UI only: detector works only when the Web UI is open (UI detector)."
msgstr ""
msgid "When email will be sent"

View File

@ -957,7 +957,7 @@ add_firewall_rule() {
nft "insert rule $NFTABLE_NAME dstnat ip daddr @${NFTSET_LOCALLIST} jump PSW_DNS"
nft "insert rule $NFTABLE_NAME dstnat ip6 daddr @${NFTSET_LOCALLIST6} jump PSW_DNS"
else
nft "insert rule $NFTABLE_NAME dstnat jump PSW2_DNS"
nft "insert rule $NFTABLE_NAME dstnat jump PSW_DNS"
fi
# for ipv4 ipv6 tproxy mark