[packages_10.03.2] crtmpserver: merge r29785
[10.03/packages.git] / multimedia / crtmpserver / patches / 030-default-config.patch
1 Index: crtmpserver-r726/builders/cmake/crtmpserver/crtmpserver.lua
2 ===================================================================
3 --- crtmpserver-r726.orig/builders/cmake/crtmpserver/crtmpserver.lua
4 +++ crtmpserver-r726/builders/cmake/crtmpserver/crtmpserver.lua
5 @@ -44,7 +44,7 @@ configuration=
6         {
7                 -- this is the root directory of all applications
8                 -- usually this is relative to the binary execuable
9 -               rootDirectory="applications",
10 +               rootDirectory="/usr/lib/crtmpserver",
11                 
12                 
13                 --this is where the applications array starts
14 @@ -68,7 +68,7 @@ configuration=
15                         -- this is the folder from where the current application gets it's content.
16                         -- It is optional. If not specified, it will be defaulted to:
17                         -- <rootDirectory>/<name>/mediaFolder
18 -                       -- mediaFolder="/some/directory/where/media/files/are/stored"
19 +                       mediaFolder="/usr/share/crtmpserver/appselector",
20                         -- the application will also be known by that names. It is optional
21                         --aliases=
22                         --{
23 @@ -89,13 +89,6 @@ configuration=
24                                 },
25                                 {
26                                         ip="0.0.0.0",
27 -                                       port=8081,
28 -                                       protocol="inboundRtmps",
29 -                                       sslKey="server.key",
30 -                                       sslCert="server.crt"
31 -                               },
32 -                               {
33 -                                       ip="0.0.0.0",
34                                         port=8080,
35                                         protocol="inboundRtmpt"
36                  },
37 @@ -105,7 +98,7 @@ configuration=
38                         description="FLV Playback Sample",
39                         name="flvplayback",
40                         protocol="dynamiclinklibrary",
41 -                       mediaFolder="/Volumes/android/backup/media/",
42 +                       mediaFolder="/media/",
43                         aliases=
44                         {
45                                 "simpleLive",
46 @@ -183,6 +176,7 @@ configuration=
47                         name="samplefactory",
48                         description="asdsadasdsa",
49                         protocol="dynamiclinklibrary",
50 +                       mediaFolder="/usr/share/ctmpserver/media",
51                         aliases=
52                         {
53                                 "httpOutboundTest"