From 013fa8ac6ca5657d4739ecfcc1cde083a83b1fc1 Mon Sep 17 00:00:00 2001 From: winlin Date: Tue, 4 Jan 2022 16:46:55 +0800 Subject: [PATCH] Install test-on self-sign certificate. v4.0.217 --- trunk/auto/depends.sh | 9 +++++ trunk/conf/https.docker.conf | 55 ++++++++++++++++++++++++++++ trunk/conf/https.rtc.conf | 18 +++++---- trunk/conf/https.rtmp2rtc.conf | 52 ++++++++++++++++++++++++++ trunk/conf/https.srs.conf | 55 ++++++++++++++++++++++++++++ trunk/configure | 1 + trunk/doc/CHANGELOG.md | 1 + trunk/src/core/srs_core_version4.hpp | 2 +- 8 files changed, 184 insertions(+), 9 deletions(-) create mode 100644 trunk/conf/https.docker.conf create mode 100644 trunk/conf/https.rtmp2rtc.conf create mode 100644 trunk/conf/https.srs.conf diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 215b86cae..4e174310f 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -474,6 +474,15 @@ ln -sf `pwd`/research/api-server/static-dir/index.html ${SRS_OBJS}/nginx/html/in # nginx.html to detect whether nginx is alive echo "Nginx is ok." > ${SRS_OBJS}/nginx/html/nginx.html +##################################################################################### +# Generate default self-sign certificate for HTTPS server, test only. +##################################################################################### +if [[ ! -f conf/server.key || ! -f conf/server.crt ]]; then + openssl genrsa -out conf/server.key 2048 + openssl req -new -x509 -key conf/server.key -out conf/server.crt -days 3650 -subj "/C=CN/ST=Beijing/L=Beijing/O=Me/OU=Me/CN=ossrs.net" + echo "Generate test-only self-sign certificate files" +fi + ##################################################################################### # cherrypy for http hooks callback, CherryPy-3.2.4 ##################################################################################### diff --git a/trunk/conf/https.docker.conf b/trunk/conf/https.docker.conf new file mode 100644 index 000000000..8170185eb --- /dev/null +++ b/trunk/conf/https.docker.conf @@ -0,0 +1,55 @@ + +listen 1935; +max_connections 1000; +daemon off; +srs_log_tank console; + +http_server { + enabled on; + listen 8080; + dir ./objs/nginx/html; + https { + enabled on; + listen 8088; + key ./conf/server.key; + cert ./conf/server.crt; + } +} + +http_api { + enabled on; + listen 1985; + https { + enabled on; + listen 1990; + key ./conf/server.key; + cert ./conf/server.crt; + } +} +stats { + network 0; +} +rtc_server { + enabled on; + listen 8000; # UDP port + # @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#config-candidate + candidate $CANDIDATE; +} + +vhost __defaultVhost__ { + hls { + enabled on; + } + http_remux { + enabled on; + mount [vhost]/[app]/[stream].flv; + } + rtc { + enabled on; + # @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#rtmp-to-rtc + rtmp_to_rtc off; + # @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#rtc-to-rtmp + rtc_to_rtmp off; + } +} + diff --git a/trunk/conf/https.rtc.conf b/trunk/conf/https.rtc.conf index 5ceb9048d..368a21252 100644 --- a/trunk/conf/https.rtc.conf +++ b/trunk/conf/https.rtc.conf @@ -31,20 +31,22 @@ stats { } rtc_server { enabled on; - # Listen at udp://8000 - listen 8000; - # - # The $CANDIDATE means fetch from env, if not configed, use * as default. - # - # The * means retrieving server IP automatically, from all network interfaces, - # @see https://github.com/ossrs/srs/issues/307#issuecomment-599028124 + listen 8000; # UDP port + # @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#config-candidate candidate $CANDIDATE; } vhost __defaultVhost__ { rtc { enabled on; - keep_bframe off; + # @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#rtmp-to-rtc + rtmp_to_rtc off; + # @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#rtc-to-rtmp + rtc_to_rtmp off; + } + http_remux { + enabled on; + mount [vhost]/[app]/[stream].flv; } } diff --git a/trunk/conf/https.rtmp2rtc.conf b/trunk/conf/https.rtmp2rtc.conf new file mode 100644 index 000000000..079458e50 --- /dev/null +++ b/trunk/conf/https.rtmp2rtc.conf @@ -0,0 +1,52 @@ + +listen 1935; +max_connections 1000; +daemon off; +srs_log_tank console; + +http_server { + enabled on; + listen 8080; + dir ./objs/nginx/html; + https { + enabled on; + listen 8088; + key ./conf/server.key; + cert ./conf/server.crt; + } +} + +http_api { + enabled on; + listen 1985; + https { + enabled on; + listen 1990; + key ./conf/server.key; + cert ./conf/server.crt; + } +} +stats { + network 0; +} +rtc_server { + enabled on; + listen 8000; # UDP port + # @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#config-candidate + candidate $CANDIDATE; +} + +vhost __defaultVhost__ { + rtc { + enabled on; + # @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#rtmp-to-rtc + rtmp_to_rtc on; + # @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#rtc-to-rtmp + rtc_to_rtmp on; + } + http_remux { + enabled on; + mount [vhost]/[app]/[stream].flv; + } +} + diff --git a/trunk/conf/https.srs.conf b/trunk/conf/https.srs.conf new file mode 100644 index 000000000..8170185eb --- /dev/null +++ b/trunk/conf/https.srs.conf @@ -0,0 +1,55 @@ + +listen 1935; +max_connections 1000; +daemon off; +srs_log_tank console; + +http_server { + enabled on; + listen 8080; + dir ./objs/nginx/html; + https { + enabled on; + listen 8088; + key ./conf/server.key; + cert ./conf/server.crt; + } +} + +http_api { + enabled on; + listen 1985; + https { + enabled on; + listen 1990; + key ./conf/server.key; + cert ./conf/server.crt; + } +} +stats { + network 0; +} +rtc_server { + enabled on; + listen 8000; # UDP port + # @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#config-candidate + candidate $CANDIDATE; +} + +vhost __defaultVhost__ { + hls { + enabled on; + } + http_remux { + enabled on; + mount [vhost]/[app]/[stream].flv; + } + rtc { + enabled on; + # @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#rtmp-to-rtc + rtmp_to_rtc off; + # @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#rtc-to-rtmp + rtc_to_rtmp off; + } +} + diff --git a/trunk/configure b/trunk/configure index 1e8c50f67..be64ac9bf 100755 --- a/trunk/configure +++ b/trunk/configure @@ -604,6 +604,7 @@ install: @echo "Now copy srs conf files" @mkdir -p \$(__REAL_INSTALL)/conf @cp -f conf/*.conf \$(__REAL_INSTALL)/conf + @cp -f conf/server.key conf/server.crt \$(__REAL_INSTALL)/conf @echo "Now copy init.d script files" @mkdir -p \$(__REAL_INSTALL)/etc/init.d @cp -f etc/init.d/srs \$(__REAL_INSTALL)/etc/init.d diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index 20c20b217..273f059fc 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -8,6 +8,7 @@ The changelog for SRS. ## SRS 4.0 Changelog +* v4.0, 2021-01-04, Install test-on self-sign certificate. v4.0.217 * v4.0, 2021-01-03, For [#2824](https://github.com/ossrs/srs/issues/2824): Support config in_docker to fix the detect fail. (#2824). v4.0.216 * v4.0, 2021-12-31, For [#2728](https://github.com/ossrs/srs/issues/2728): Refine error log for rtmp2rtc. (#2728). v4.0.215 * v4.0, 2021-12-29, Merge [#2770](https://github.com/ossrs/srs/pull/2770), [#2820](https://github.com/ossrs/srs/pull/2820): Bugs fixed. (#2770)(#2820). v4.0.214 diff --git a/trunk/src/core/srs_core_version4.hpp b/trunk/src/core/srs_core_version4.hpp index 34e6eed6c..9238cb913 100644 --- a/trunk/src/core/srs_core_version4.hpp +++ b/trunk/src/core/srs_core_version4.hpp @@ -9,6 +9,6 @@ #define VERSION_MAJOR 4 #define VERSION_MINOR 0 -#define VERSION_REVISION 216 +#define VERSION_REVISION 217 #endif