mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
Install test-on self-sign certificate. v4.0.217
This commit is contained in:
parent
c0a7790c91
commit
013fa8ac6c
8 changed files with 184 additions and 9 deletions
|
@ -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
|
# nginx.html to detect whether nginx is alive
|
||||||
echo "Nginx is ok." > ${SRS_OBJS}/nginx/html/nginx.html
|
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
|
# cherrypy for http hooks callback, CherryPy-3.2.4
|
||||||
#####################################################################################
|
#####################################################################################
|
||||||
|
|
55
trunk/conf/https.docker.conf
Normal file
55
trunk/conf/https.docker.conf
Normal file
|
@ -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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -31,20 +31,22 @@ stats {
|
||||||
}
|
}
|
||||||
rtc_server {
|
rtc_server {
|
||||||
enabled on;
|
enabled on;
|
||||||
# Listen at udp://8000
|
listen 8000; # UDP port
|
||||||
listen 8000;
|
# @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#config-candidate
|
||||||
#
|
|
||||||
# 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
|
|
||||||
candidate $CANDIDATE;
|
candidate $CANDIDATE;
|
||||||
}
|
}
|
||||||
|
|
||||||
vhost __defaultVhost__ {
|
vhost __defaultVhost__ {
|
||||||
rtc {
|
rtc {
|
||||||
enabled on;
|
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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
52
trunk/conf/https.rtmp2rtc.conf
Normal file
52
trunk/conf/https.rtmp2rtc.conf
Normal file
|
@ -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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
55
trunk/conf/https.srs.conf
Normal file
55
trunk/conf/https.srs.conf
Normal file
|
@ -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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
1
trunk/configure
vendored
1
trunk/configure
vendored
|
@ -604,6 +604,7 @@ install:
|
||||||
@echo "Now copy srs conf files"
|
@echo "Now copy srs conf files"
|
||||||
@mkdir -p \$(__REAL_INSTALL)/conf
|
@mkdir -p \$(__REAL_INSTALL)/conf
|
||||||
@cp -f conf/*.conf \$(__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"
|
@echo "Now copy init.d script files"
|
||||||
@mkdir -p \$(__REAL_INSTALL)/etc/init.d
|
@mkdir -p \$(__REAL_INSTALL)/etc/init.d
|
||||||
@cp -f etc/init.d/srs \$(__REAL_INSTALL)/etc/init.d
|
@cp -f etc/init.d/srs \$(__REAL_INSTALL)/etc/init.d
|
||||||
|
|
|
@ -8,6 +8,7 @@ The changelog for SRS.
|
||||||
|
|
||||||
## SRS 4.0 Changelog
|
## 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-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-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
|
* 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
|
||||||
|
|
|
@ -9,6 +9,6 @@
|
||||||
|
|
||||||
#define VERSION_MAJOR 4
|
#define VERSION_MAJOR 4
|
||||||
#define VERSION_MINOR 0
|
#define VERSION_MINOR 0
|
||||||
#define VERSION_REVISION 216
|
#define VERSION_REVISION 217
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue