From 042c103f9738ca1ad5e1bfbfdf711d694ccdc247 Mon Sep 17 00:00:00 2001
From: CN_SZTL <cnsztl@project-openwrt.eu.org>
Date: Wed, 29 Jul 2020 17:40:15 +0800
Subject: [PATCH] luci-app-nginx-pingos: sync with upstream source

---
 package/lienol/luci-app-nginx-pingos/Makefile                 | 2 +-
 .../lienol/luci-app-nginx-pingos/luasrc/model/cbi/pingos.lua  | 3 +++
 package/lienol/luci-app-nginx-pingos/po/zh-cn/pingos.po       | 3 +++
 package/lienol/luci-app-nginx-pingos/root/etc/config/pingos   | 3 ++-
 package/lienol/luci-app-nginx-pingos/root/etc/init.d/pingos   | 3 +++
 package/lienol/luci-app-nginx-pingos/root/etc/pingos.template | 4 +++-
 6 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/package/lienol/luci-app-nginx-pingos/Makefile b/package/lienol/luci-app-nginx-pingos/Makefile
index 61afbb9631..91eb160400 100644
--- a/package/lienol/luci-app-nginx-pingos/Makefile
+++ b/package/lienol/luci-app-nginx-pingos/Makefile
@@ -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/
diff --git a/package/lienol/luci-app-nginx-pingos/luasrc/model/cbi/pingos.lua b/package/lienol/luci-app-nginx-pingos/luasrc/model/cbi/pingos.lua
index ef8cd4cc04..7f40a72968 100644
--- a/package/lienol/luci-app-nginx-pingos/luasrc/model/cbi/pingos.lua
+++ b/package/lienol/luci-app-nginx-pingos/luasrc/model/cbi/pingos.lua
@@ -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
diff --git a/package/lienol/luci-app-nginx-pingos/po/zh-cn/pingos.po b/package/lienol/luci-app-nginx-pingos/po/zh-cn/pingos.po
index 39eebbeade..1b49421e03 100644
--- a/package/lienol/luci-app-nginx-pingos/po/zh-cn/pingos.po
+++ b/package/lienol/luci-app-nginx-pingos/po/zh-cn/pingos.po
@@ -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 "录像"
 
diff --git a/package/lienol/luci-app-nginx-pingos/root/etc/config/pingos b/package/lienol/luci-app-nginx-pingos/root/etc/config/pingos
index 2c6bfc8581..128af52251 100644
--- a/package/lienol/luci-app-nginx-pingos/root/etc/config/pingos
+++ b/package/lienol/luci-app-nginx-pingos/root/etc/config/pingos
@@ -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'
diff --git a/package/lienol/luci-app-nginx-pingos/root/etc/init.d/pingos b/package/lienol/luci-app-nginx-pingos/root/etc/init.d/pingos
index a27f54390f..979f2eefb9 100644
--- a/package/lienol/luci-app-nginx-pingos/root/etc/init.d/pingos
+++ b/package/lienol/luci-app-nginx-pingos/root/etc/init.d/pingos
@@ -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() {
diff --git a/package/lienol/luci-app-nginx-pingos/root/etc/pingos.template b/package/lienol/luci-app-nginx-pingos/root/etc/pingos.template
index 402d75b24e..9e94111f9a 100644
--- a/package/lienol/luci-app-nginx-pingos/root/etc/pingos.template
+++ b/package/lienol/luci-app-nginx-pingos/root/etc/pingos.template
@@ -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;