From 149ad80b5dfc444a21fbb55cfd43dfd2649dfe14 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Sat, 25 Sep 2021 10:09:25 +0800
Subject: [PATCH] Squash: Merge SRS 4.0

---
 trunk/conf/live.conf | 28 ++++++++++++++++++++++++++++
 trunk/conf/rtc.conf  |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 trunk/conf/live.conf

diff --git a/trunk/conf/live.conf b/trunk/conf/live.conf
new file mode 100644
index 000000000..e2cf80c28
--- /dev/null
+++ b/trunk/conf/live.conf
@@ -0,0 +1,28 @@
+# Live streaming config for SRS.
+# @see full.conf for detail config.
+
+listen              1935;
+max_connections     1000;
+srs_log_tank        console;
+daemon              off;
+
+http_api {
+    enabled         on;
+    listen          1985;
+}
+
+http_server {
+    enabled         on;
+    listen          8080;
+    dir             ./objs/nginx/html;
+}
+
+vhost __defaultVhost__ {
+    hls {
+        enabled         on;
+    }
+    http_remux {
+        enabled     on;
+        mount       [vhost]/[app]/[stream].flv;
+    }
+}
diff --git a/trunk/conf/rtc.conf b/trunk/conf/rtc.conf
index 0a3360c9f..742669e18 100644
--- a/trunk/conf/rtc.conf
+++ b/trunk/conf/rtc.conf
@@ -1,3 +1,5 @@
+# WebRTC streaming config for SRS.
+# @see full.conf for detail config.
 
 listen              1935;
 max_connections     1000;