From 724e23f8a9390fe9a03d9fce575c0d93e55cdc05 Mon Sep 17 00:00:00 2001
From: langhuihui <178529795@qq.com>
Date: Fri, 24 Nov 2023 14:58:25 +0800
Subject: [PATCH] chore: modify conf dir name

---
 {conf => conf-example}/hls.yaml   | 0
 {conf => conf-example}/https.yaml | 0
 {conf => conf-example}/rtmp.yaml  | 0
 {conf => conf-example}/rtmps.yaml | 0
 {conf => conf-example}/rtsp.yaml  | 0
 conf-example/说明.txt             | 5 +++++
 go.mod                            | 2 +-
 go.sum                            | 2 ++
 goreleaser.yml                    | 2 +-
 9 files changed, 9 insertions(+), 2 deletions(-)
 rename {conf => conf-example}/hls.yaml (100%)
 rename {conf => conf-example}/https.yaml (100%)
 rename {conf => conf-example}/rtmp.yaml (100%)
 rename {conf => conf-example}/rtmps.yaml (100%)
 rename {conf => conf-example}/rtsp.yaml (100%)
 create mode 100644 conf-example/说明.txt

diff --git a/conf/hls.yaml b/conf-example/hls.yaml
similarity index 100%
rename from conf/hls.yaml
rename to conf-example/hls.yaml
diff --git a/conf/https.yaml b/conf-example/https.yaml
similarity index 100%
rename from conf/https.yaml
rename to conf-example/https.yaml
diff --git a/conf/rtmp.yaml b/conf-example/rtmp.yaml
similarity index 100%
rename from conf/rtmp.yaml
rename to conf-example/rtmp.yaml
diff --git a/conf/rtmps.yaml b/conf-example/rtmps.yaml
similarity index 100%
rename from conf/rtmps.yaml
rename to conf-example/rtmps.yaml
diff --git a/conf/rtsp.yaml b/conf-example/rtsp.yaml
similarity index 100%
rename from conf/rtsp.yaml
rename to conf-example/rtsp.yaml
diff --git a/conf-example/说明.txt b/conf-example/说明.txt
new file mode 100644
index 0000000..2baa803
--- /dev/null
+++ b/conf-example/说明.txt
@@ -0,0 +1,5 @@
+本目录下所有配置文件都是代表某些配置的例子，只是例子！！！
+monibuca 不会读取这个目录下的任何文件！！！
+monibuca 默认读取的是 config.yaml
+请根据需要自行修改 config.yaml
+当然也可以通过 -c 命令指定读取的配置文件
\ No newline at end of file
diff --git a/go.mod b/go.mod
index 165b5d4..044e186 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,7 @@ go 1.20
 
 require (
 	go.uber.org/zap v1.26.0
-	m7s.live/engine/v4 v4.14.3
+	m7s.live/engine/v4 v4.14.4-0.20231121105905-db2dbf06ef6f
 	m7s.live/plugin/debug/v4 v4.0.1
 	m7s.live/plugin/fmp4/v4 v4.0.5
 	m7s.live/plugin/gb28181/v4 v4.4.3
diff --git a/go.sum b/go.sum
index 1644a4f..b0c0f4a 100644
--- a/go.sum
+++ b/go.sum
@@ -430,6 +430,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 m7s.live/engine/v4 v4.14.3 h1:yTUm40lQ+wI7/IkO2UvPZAbKAS5ovmbdm2DPe+twhl4=
 m7s.live/engine/v4 v4.14.3/go.mod h1:cRR/WOZbPSAQfYxIHuCkj1YMg+C54CYlFpOJ88q+OG4=
+m7s.live/engine/v4 v4.14.4-0.20231121105905-db2dbf06ef6f h1:HITFyQxX8OlXccwCmkhx6+A3PxKRJV+xAA/RKZSM/kk=
+m7s.live/engine/v4 v4.14.4-0.20231121105905-db2dbf06ef6f/go.mod h1:cRR/WOZbPSAQfYxIHuCkj1YMg+C54CYlFpOJ88q+OG4=
 m7s.live/plugin/debug/v4 v4.0.1 h1:sX0UADsiikwSol8qx+8aQzGeaFa8yJFa/cUKpBs5Lzw=
 m7s.live/plugin/debug/v4 v4.0.1/go.mod h1:A/C1ViacCOK7EPeeCfiwlUrC2TUtRdEqzrR0Yd9b1KQ=
 m7s.live/plugin/fmp4/v4 v4.0.5 h1:0madI/TKvrLkYVAKuPK1HBvbVf0RJg0g2WruET3S+9c=
diff --git a/goreleaser.yml b/goreleaser.yml
index ccfe494..f2d5381 100644
--- a/goreleaser.yml
+++ b/goreleaser.yml
@@ -4,7 +4,7 @@ archives:
     files:
       - config.yaml
       - favicon.ico
-      - conf/*
+      - conf-example/*
 builds:
   - id: "with-debug"
     env: [CGO_ENABLED=0]