[SCM] crtmpserver/master: Update config files.

[jet-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f2ccad82465540ddbdbea6eaccd9834b92a3be85
Author: Andriy Beregovenko <jet at jet.kiev.ua>
Date:   Mon Mar 19 00:48:36 2012 +0200

    Update config files.
    
    Update configuration files according to upstream version.

diff --git a/debian/crtmpserver-apps-scripts/flvplayback.lua b/debian/crtmpserver-apps-scripts/flvplayback.lua
index 51697dd..96f1099 100644
--- a/debian/crtmpserver-apps-scripts/flvplayback.lua
+++ b/debian/crtmpserver-apps-scripts/flvplayback.lua
@@ -13,28 +13,6 @@ application=
 		"SOSample",
 		"oflaDemo",
 	},
-	validateHandshake=true,
-	keyframeSeek=true,
-	seekGranularity=1.5, --in seconds, between 0.1 and 600
-	clientSideBuffer=12, --in seconds, between 5 and 30
-	--generateMetaFiles=true, --this will generate seek/meta files on application startup
-	--renameBadFiles=false,
-	authentication=
-	{
-		rtmp=
-		{
-			type="adobe",
-			encoderAgents=
-			{
-				"FMLE/3.0 (compatible; FMSc/1.0)",
-			},
-			usersFile="/etc/crtmpserver/conf.d/users.lua"
-		},
-		rtsp=
-		{
-			usersFile="/etc/crtmpserver/conf.d/users.lua"
-		}
-	},
 	acceptors =
 	{
 		{
@@ -62,63 +40,41 @@ application=
 	},
 	externalStreams =
 	{
-		-- Example streams
-		--[[{
-			uri="mms://channels.webradio.antenne.de/chillout",
-			localStreamName="myMms",
-			enableAAC=false,
-			enableMP3=true
-		},
-		{
-			uri="rtsp://a1956.l1857055475.c18570.g.lq.akamaistream.net/D/1956/18570/v0001/reflector:55475",
-			localStreamName="test_aaa",
-		},
-		{
-			uri="rtsp://0.0.0.0:2323/test.sdp",
-			localStreamName="stream-1-udp"
-		},
-		{
-			uri="rtsp://stream01.qt.slamtv.true.nl/slamtv.sdp",
-			localStreamName="stream0-udp"
-		},
-		{
-			uri="rtsp://stream01.qt.slamtv.true.nl/slamtv.sdp",
-			localStreamName="stream0-tcp",
-			forceTcp=true
-		},
-		{
-			uri="rtmp://10.0.1.15/vod/mp4:test_mp4",
-			localStreamName="stream1"
-		},
+		--[[
 		{
-			uri="rtmp://10.0.1.15/vod/test_flv",
-			localStreamName="stream2"
-		},
-		{
-			uri="rtsp://media-us-2.soundreach.net/slcn_lifestyle.sdp",
-			localStreamName="stream3",
+			uri="rtsp://fms20.mediadirect.ro/live2/realitatea/realitatea",
+			localStreamName="rtsp_test",
 			forceTcp=true
 		},
 		{
-			uri="rtsp://82.177.67.61/axis-media/media.amp",
-			localStreamName="stream4",
-			forceTcp=false
-		},
-		{
-			uri="http://v13.nonxt6.c.youtube.com/videoplayback?ip=0.0.0.0&sparams=id%2Cexpire%2Cip%2Cipbits%2Citag%2Calgorithm%2Cburst%2Cfactor%2Coc%3AU0dXSlFSVl9FSkNNN19JTFpF&algorithm=throttle-factor&itag=34&ipbits=0&burst=40&sver=3&expire=1285178400&key=yt1&signature=548764ECB414E3CA08BDD414F4B633853F9051AC.D8FFF913C9B3BF1C339BD1A60A77C5D1790775EE&factor=1.25&id=bcdad173a3ba8daa&redirect_counter=1",
-			localStreamName="stream5",
-		}
-		{
 			uri="rtmp://edge01.fms.dutchview.nl/botr/bunny",
-			localStreamName="stream6",
-			emulateUserAgent="MAC 10,1,82,76",
-		}
-		{
-			uri="rtmp://edge01.fms.dutchview.nl/botr/bunny",
-			localStreamName="stream6",
+			localStreamName="rtmp_test",
 			swfUrl="http://www.example.com/example.swf";
 			pageUrl="http://www.example.com/";
 			emulateUserAgent="MAC 10,1,82,76",
 		}]]--
 	},
-}
\ No newline at end of file
+	validateHandshake=true,
+	keyframeSeek=true,
+	seekGranularity=1.5, --in seconds, between 0.1 and 600
+	clientSideBuffer=12, --in seconds, between 5 and 30
+	--generateMetaFiles=true, --this will generate seek/meta files on application startup
+	--renameBadFiles=false,
+	--enableCheckBandwidth=true,
+	--[[authentication=
+	{
+		rtmp={
+			type="adobe",
+			encoderAgents=
+			{
+				"FMLE/3.0 (compatible; FMSc/1.0)",
+				"My user agent",
+			},
+			usersFile="users.lua"
+		},
+		rtsp={
+			usersFile="users.lua"
+		}
+	}, --]]
+}
+
diff --git a/debian/crtmpserver-apps-scripts/proxypublish.lua b/debian/crtmpserver-apps-scripts/proxypublish.lua
index a9deeff..4ebddcb 100644
--- a/debian/crtmpserver-apps-scripts/proxypublish.lua
+++ b/debian/crtmpserver-apps-scripts/proxypublish.lua
@@ -12,35 +12,31 @@ application=
 		},
 	},
 	abortOnConnectError=true,
-	targetServers=
+	targetServers = 
 	{
 		--[[{
 			targetUri="rtmp://x.xxxxxxx.fme.ustream.tv/ustreamVideo/xxxxxxx",
 			targetStreamName="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
 			localStreamName="gigi",
 			emulateUserAgent="FMLE/3.0 (compatible; FMSc/1.0 http://www.rtmpd.com)"
-		},]]--
+		}]]--,
 		{
-			targetUri="rtmp://localhost/vod",
+			targetUri="rtmp://gigi:spaima@localhost/vod",
 			targetStreamType="live", -- (live, record or append)
 			emulateUserAgent="My user agent",
-			localStreamName="stream1"
+			localStreamName="stream1",
+			keepAlive=true
 		},
 	},
-	--[[
-	externalStreams =
+	--[[externalStreams =
 	{
 		{
-			uri="rtsp://82.177.67.61/axis-media/media.amp",
-			localStreamName="stream4",
-			forceTcp=false
+			uri="rtsp://fms20.mediadirect.ro/live2/realitatea/realitatea",
+			localStreamName="stream1",
+			forceTcp=true,
+			keepAlive=true
 		},
-		{
-			uri="rtmp://edge01.fms.dutchview.nl/botr/bunny",
-			localStreamName="stream1"
-		},
-	},
-	]]--
+	},]]--
 	--validateHandshake=true,
 	--default=true,
 }
diff --git a/debian/crtmpserver-scripts/log_appenders.lua b/debian/crtmpserver-scripts/log_appenders.lua
index 04d0fd6..2243a36 100644
--- a/debian/crtmpserver-scripts/log_appenders.lua
+++ b/debian/crtmpserver-scripts/log_appenders.lua
@@ -20,6 +20,11 @@ logAppenders=
 		type="file",
 		level=6,
 		-- the file where the log messages are going to land
-		fileName="/var/log/crtmpserver/main.log"
+		fileName="/var/log/crtmpserver/main.log",
+                --newLineCharacters="\r\n",
+                --fileHistorySize=10,
+                --fileLength=1024*256,
+                --singleLine=true
 	}
-}
\ No newline at end of file
+}
+

-- 
crtmpserver packaging