From 08bffc60fb526bcf2098e05acbcb0df9cf24ad94 Mon Sep 17 00:00:00 2001 From: winlin Date: Fri, 13 Mar 2020 16:29:54 +0800 Subject: [PATCH 1/4] Update install --- trunk/scripts/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trunk/scripts/install.sh b/trunk/scripts/install.sh index 3a1c6292a..6f161b13f 100755 --- a/trunk/scripts/install.sh +++ b/trunk/scripts/install.sh @@ -23,7 +23,7 @@ ret=$?; if [[ $ret -ne 0 ]]; then exit $ret; fi # check lsb_release ok_msg "check tools" lsb_release -v >/dev/null 2>&1; ret=$? -if [[ $ret -ne 0 ]]; then failed_msg "abort, please install lsb_release"; exit $ret; fi +if [[ $ret -ne 0 ]]; then failed_msg "no lsb_release, install: yum install -y redhat-lsb"; exit $ret; fi # user must stop service first. ok_msg "check previous install" From fc3704e54e8805f2fef237cee7652751e0eb12c5 Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 14 Mar 2020 14:32:49 +0800 Subject: [PATCH 2/4] Update README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 317fdb762..60b0f3e17 100755 --- a/README.md +++ b/README.md @@ -5,8 +5,8 @@ [![](https://codecov.io/gh/ossrs/srs/branch/3.0release/graph/badge.svg)](https://codecov.io/gh/ossrs/srs/branch/3.0release) [![](https://cloud.githubusercontent.com/assets/2777660/22814959/c51cbe72-ef92-11e6-81cc-32b657b285d5.png)](https://github.com/ossrs/srs/wiki/v1_CN_Contact#wechat) -SRS/3.0，[OuXuli][release3]，是一个流媒体直播集群，高效、稳定、易用，简单而快乐。
-SRS(Simple RTMP Server) is a live streaming cluster, high efficiency, stable and simple. +SRS/3.0，[OuXuli][release3]，是一个流媒体集群，支持RTMP/HLS/WebRTC/SRT/GB28181，高效、稳定、易用，简单而快乐。
+SRS(Simple RTMP Server) is a RTMP/HLS/WebRTC/SRT/GB28181 streaming cluster, high efficiency, stable and simple. > Remark: Although SRS is licenced under [MIT][LICENSE], but there are some depended libraries which are distributed using their own licenses, please read [License Mixing][LicenseMixing]. From 446e5f9a0cac220723ea41c4b5635ba0175aa1ae Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 14 Mar 2020 14:34:20 +0800 Subject: [PATCH 3/4] Update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 60b0f3e17..5a47871ee 100755 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [![](https://cloud.githubusercontent.com/assets/2777660/22814959/c51cbe72-ef92-11e6-81cc-32b657b285d5.png)](https://github.com/ossrs/srs/wiki/v1_CN_Contact#wechat) SRS/3.0，[OuXuli][release3]，是一个流媒体集群，支持RTMP/HLS/WebRTC/SRT/GB28181，高效、稳定、易用，简单而快乐。
-SRS(Simple RTMP Server) is a RTMP/HLS/WebRTC/SRT/GB28181 streaming cluster, high efficiency, stable and simple. +SRS is a RTMP/HLS/WebRTC/SRT/GB28181 streaming cluster, high efficiency, stable and simple. > Remark: Although SRS is licenced under [MIT][LICENSE], but there are some depended libraries which are distributed using their own licenses, please read [License Mixing][LicenseMixing]. From 88336b1f5edc0a1a890a1aa27b4b83bcc1b548cc Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 14 Mar 2020 14:38:26 +0800 Subject: [PATCH 4/4] Remove KAFKA config, because it's removed from code --- README.md | 1 - trunk/conf/full.conf | 19 ------------------- 2 files changed, 20 deletions(-) diff --git a/README.md b/README.md index 5a47871ee..3ab704f65 100755 --- a/README.md +++ b/README.md @@ -302,7 +302,6 @@ For previous versions, please read: * v3.0, 2016-12-15, fix [#717][bug #717], [#691][bug #691], http api/static/stream support cors. 3.0.9 * v3.0, 2016-12-08, Fix [#105][bug #105], support log rotate signal SIGUSR1. 3.0.8 * v3.0, 2016-12-07, fix typo and refine grammar. 3.0.7 -* v3.0, 2015-10-23, fix [#467][bug #467], support write log to kafka. 3.0.6 * v3.0, 2015-10-20, fix [#502][bug #502], support snapshot with http-callback or transcoder. 3.0.5 * v3.0, 2015-09-19, support amf0 and json to convert with each other. * v3.0, 2015-09-19, json objects support dumps to string. diff --git a/trunk/conf/full.conf b/trunk/conf/full.conf index a29b71bc1..74f62d4c6 100644 --- a/trunk/conf/full.conf +++ b/trunk/conf/full.conf @@ -284,25 +284,6 @@ stream_caster { listen 8936; } -############################################################################################# -# Kafka sections -############################################################################################# -# Apache Kafka is a high-throughput distributed messaging system. -# SRS is a Kafka producer to send message to kafka. -# @see https://kafka.apache.org/documentation.html#introduction -kafka { - # whether enabled kafka. - # default: off - enabled off; - # the broker list, broker is - # and use space to specify multple brokers. - # for example, 127.0.0.1:9092 127.0.0.1:9093 - brokers 127.0.0.1:9092; - # the kafka topic to use. - # default: srs - topic srs; -} - ############################################################################################# # RTMP/HTTP VHOST sections #############################################################################################