Browse Source

Changed submodule. (rtmp -> flv)

master
Hakase 2 months ago
parent
commit
0c8665df5a
Signed by: Hakase <hakase@hakase.app> GPG Key ID: BB2821A9E0DF48C9
6 changed files with 8 additions and 9 deletions
  1. 3
    4
      .gitmodules
  2. 1
    1
      auto.sh
  3. 2
    2
      config.inc.example
  4. 1
    0
      lib/nginx-http-flv-module
  5. 0
    1
      lib/nginx-rtmp-module
  6. 1
    1
      lib/pcre

+ 3
- 4
.gitmodules View File

@@ -7,9 +7,6 @@
7 7
 [submodule "lib/nginx-dav-ext-module"]
8 8
 	path = lib/nginx-dav-ext-module
9 9
 	url = https://github.com/arut/nginx-dav-ext-module.git
10
-[submodule "lib/nginx-rtmp-module"]
11
-	path = lib/nginx-rtmp-module
12
-	url = https://github.com/arut/nginx-rtmp-module.git
13 10
 [submodule "lib/ngx_brotli"]
14 11
 	path = lib/ngx_brotli
15 12
 	url = https://github.com/eustas/ngx_brotli.git
@@ -29,10 +26,12 @@
29 26
 	path = lib/zlib
30 27
 	url = https://github.com/cloudflare/zlib.git
31 28
 	branch = gcc.amd64
32
-
33 29
 [submodule "lib/ngx_http_geoip2_module"]
34 30
 	path = lib/ngx_http_geoip2_module
35 31
 	url = https://github.com/leev/ngx_http_geoip2_module.git
36 32
 [submodule "lib/nginx-module-vts"]
37 33
 	path = lib/nginx-module-vts
38 34
 	url = https://github.com/vozlt/nginx-module-vts
35
+[submodule "lib/nginx-http-flv-module"]
36
+	path = lib/nginx-http-flv-module
37
+	url = https://github.com/winshining/nginx-http-flv-module.git

+ 1
- 1
auto.sh View File

@@ -94,7 +94,7 @@ TEMP_OPT="-lm"
94 94
 
95 95
 ### Module check
96 96
 if [ "$PAGESPEED" = 1 ]; then BUILD_MODULES="--add-module=./lib/pagespeed ${PS_NGX_EXTRA_FLAGS}"; fi
97
-if [ "$RTMP" = 1 ]; then BUILD_MODULES="${BUILD_MODULES} --add-module=./lib/nginx-rtmp-module"; fi
97
+if [ "$FLV" = 1 ]; then BUILD_MODULES="${BUILD_MODULES} --add-module=./lib/nginx-http-flv-module"; fi
98 98
 if [ "$NAXSI" = 1 ]; then BUILD_MODULES="${BUILD_MODULES} --add-module=./lib/naxsi/naxsi_src"; fi
99 99
 if [ "$DAV_EXT" = 1 ]; then BUILD_MODULES="${BUILD_MODULES} --add-module=./lib/nginx-dav-ext-module"; fi
100 100
 if [ "$FANCYINDEX" = 1 ]; then BUILD_MODULES="${BUILD_MODULES} --add-module=./lib/ngx-fancyindex"; fi

+ 2
- 2
config.inc.example View File

@@ -32,8 +32,8 @@ LTO=1
32 32
 ### PageSpeed
33 33
 PAGESPEED=0
34 34
 
35
-### nginx-rtmp-module
36
-RTMP=0
35
+### nginx-http-flv-module
36
+FLV=0
37 37
 
38 38
 ### naxsi
39 39
 NAXSI=1

+ 1
- 0
lib/nginx-http-flv-module

@@ -0,0 +1 @@
1
+Subproject commit f6d0461b73133ed5f7088f7b732f6ed1f786f24f

+ 0
- 1
lib/nginx-rtmp-module

@@ -1 +0,0 @@
1
-Subproject commit 791b6136f02bc9613daf178723ac09f4df5a3bbf

+ 1
- 1
lib/pcre

@@ -1 +1 @@
1
-Subproject commit f9f0c6b54d62d048001c508e5384174e74155bb1
1
+Subproject commit 10e4adbfe9aab5869079fba5edc0ce56fa1b078e

Loading…
Cancel
Save