OpenWrt
/
small-package
mirror of https://github.com/kenzok8/small-package
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update 2024-01-05 16:22:54

This commit is contained in:
github-actions[bot] 2024-01-05 16:22:54 +08:00
parent ac26714754
commit f78b8346c5
4 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
luci-app-heimdall/Makefile
View File

@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_VERSION:=1.1.1-20231208 PKG_VERSION:=1.1.2-20240105
PKG_RELEASE:= PKG_RELEASE:=
LUCI_TITLE:=LuCI support for heimdall LUCI_TITLE:=LuCI support for heimdall

13
luci-app-heimdall/luasrc/view/heimdall/status.htm
View File

@ -17,15 +17,26 @@ local container_running = container_status == "running"
<% <%
if container_running then if container_running then
local port=util.trim(util.exec("/usr/libexec/istorec/heimdall.sh port")) local port=util.trim(util.exec("/usr/libexec/istorec/heimdall.sh port"))
local https_port=util.trim(util.exec("/usr/libexec/istorec/heimdall.sh https_port"))
if port == "" then if port == "" then
port="8088" port="8088"
end end
if https_port == "" then
https_port="8089"
end
-%> -%>
<div class="cbi-value cbi-value-last"> <div class="cbi-value">
<label class="cbi-value-title">&nbsp;</label> <label class="cbi-value-title">&nbsp;</label>
<div class="cbi-value-field"> <div class="cbi-value-field">
<input type="button" class="btn cbi-button cbi-button-apply" name="start" value="<%:Open Heimdall%>" onclick="window.open('http://'+location.hostname+':<%=port%>/', '_blank')"> <input type="button" class="btn cbi-button cbi-button-apply" name="start" value="<%:Open Heimdall%>" onclick="window.open('http://'+location.hostname+':<%=port%>/', '_blank')">
</div> </div>
</div> </div>
<div class="cbi-value cbi-value-last">
<label class="cbi-value-title">&nbsp;</label>
<div class="cbi-value-field">
<input type="button" class="btn cbi-button cbi-button-apply" name="start" value="<%:Open Heimdall%> (HTTPS)" onclick="window.open('https://'+location.hostname+':<%=https_port%>/', '_blank')">
</div>
</div>
<% end %> <% end %>

8
luci-app-heimdall/root/usr/libexec/istorec/heimdall.sh
View File

@ -55,7 +55,8 @@ usage() {
echo " upgrade Upgrade the heimdall" echo " upgrade Upgrade the heimdall"
echo " rm/start/stop/restart Remove/Start/Stop/Restart the heimdall" echo " rm/start/stop/restart Remove/Start/Stop/Restart the heimdall"
echo " status Heimdall status" echo " status Heimdall status"
echo " port Heimdall port" echo " port Heimdall http port"
echo " https_port Heimdall https port"
} }
case ${ACTION} in case ${ACTION} in
@ -75,7 +76,10 @@ case ${ACTION} in
docker ps --all -f 'name=heimdall' --format '{{.State}}' docker ps --all -f 'name=heimdall' --format '{{.State}}'
;; ;;
"port") "port")
docker ps --all -f 'name=heimdall' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' docker ps --all -f 'name=heimdall' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*->80/tcp' | sed 's/0.0.0.0:\([0-9]*\)->.*/\1/'
;;
"https_port")
docker ps --all -f 'name=heimdall' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*->443/tcp' | sed 's/0.0.0.0:\([0-9]*\)->.*/\1/'
;; ;;
*) *)
usage usage

4
v2ray-geodata/Makefile
View File

@ -21,13 +21,13 @@ define Download/geoip
HASH:=be6b14abf56d9819119db951f711051382b247006da03425363826288825a9dd HASH:=be6b14abf56d9819119db951f711051382b247006da03425363826288825a9dd
endef endef
GEOSITE_VER:=20240104053246 GEOSITE_VER:=20240105034708
GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER) GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER)
define Download/geosite define Download/geosite
URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/ URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/
URL_FILE:=dlc.dat URL_FILE:=dlc.dat
FILE:=$(GEOSITE_FILE) FILE:=$(GEOSITE_FILE)
HASH:=370eee6e8658252826073a878ae2611c46ae264778488b7140c9eedbd23f6720 HASH:=9f833c47b103fb475a68d3b0f5db99d7b7c31dd9deab9171781420db10751641
endef endef
GEOSITE_IRAN_VER:=202401010029 GEOSITE_IRAN_VER:=202401010029