luci-app-nginx-pingos: sync with upstream source

This commit is contained in:
CN_SZTL 2020-07-29 17:40:15 +08:00
parent ebb7559137
commit 042c103f97
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
6 changed files with 15 additions and 3 deletions

View File

@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-nginx-pingos
PKG_VERSION:=1.19.0
PKG_RELEASE:=3
PKG_RELEASE:=4
PKG_SOURCE:=nginx-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://nginx.org/download/

View File

@ -26,6 +26,9 @@ end
o = s:taboption("global", Flag, "enable", translate("Enable"))
o.rmempty = false
o = s:taboption("global", Flag, "ipv6", translate("Listen IPv6"))
o.rmempty = false
o = s:taboption("global", Value, "http_port", "HTTP(S)" ..translate("Port"))
o.datatype = "port"
o.default = 8082

View File

@ -31,6 +31,9 @@ msgstr "这是文件内容:%s"
msgid "Values enclosed by pipe symbols ('|') should not be changed. They get their values from the '%s' tab."
msgstr "由管道符(“|”)包围的值不应更改。它们将从 '%s' 标签中获取其值。"
msgid "Listen IPv6"
msgstr "监听IPv6"
msgid "Record"
msgstr "录像"

View File

@ -1,7 +1,8 @@
config global
option https '0'
option enable '0'
option ipv6 '0'
option https '0'
option ts_record '0'
option flv_record '0'
option http_port '18080'

View File

@ -16,6 +16,7 @@ config_t_get() {
}
gen_nginx_config() {
ipv6=$(config_t_get global ipv6 0)
http_port=$(config_t_get global http_port)
[ "$(config_t_get global https 0)" == "1" ] && {
http_port="$http_port ssl"
@ -44,6 +45,8 @@ gen_nginx_config() {
-e "s#|FLV_RECORD|#$flv_record#g" \
-e "s#|RECORD_PATH|#$record_path#g" \
/etc/$CONFIG.template > $1
[ "$ipv6" = "0" ] && sed -i '/listen \[::\]:/d' $1
}
start() {

View File

@ -37,9 +37,10 @@ rtmp {
server {
listen |RTMP_PORT|;
listen [::]:|RTMP_PORT| ipv6only=on;
serverid 000;
out_queue 2048;
server_name live.pingos.io;
server_name localhost;
rtmp_auto_pull on;
rtmp_auto_pull_port unix:|TMP_PATH|/rtmp;
@ -114,6 +115,7 @@ http {
server {
listen |HTTP_PORT|;
listen [::]:|HTTP_PORT|;
|ssl_certificate|
|ssl_certificate_key|
ssl_session_cache shared:SSL:1m;