[SCM] crtmpserver/master: fix whitespace issues
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Tue Dec 6 17:57:14 UTC 2011
The following commit has been merged in the master branch:
commit ebe08b58ab023d0fbf24928d020deefb5a0e0907
Author: Reinhard Tartler <siretart at tauware.de>
Date: Tue Dec 6 17:38:30 2011 +0100
fix whitespace issues
diff --git a/debian/NEWS b/debian/NEWS
index 1a7fdef..9dce64e 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -4,8 +4,8 @@ crtmpserver (0.0~dfsg+svn611.1-1) unstable; urgency=low
- added MMS support;
- added HLS support;
- several improvements in MPEG-TS protocol.
- * Package was divided to 4 packages:
- - crtmpserver-libs, with 'thelib' and 'common' inside. Now you do not
+ * Package was divided to 4 packages:
+ - crtmpserver-libs, with 'thelib' and 'common' inside. Now you do not
need to install all if you have very customized own build.
- crtmpserver-apps, default applications which provides by upstream.
- crtmpserver-dev, headers for 'thelib' and 'common' libs.
@@ -14,4 +14,3 @@ crtmpserver (0.0~dfsg+svn611.1-1) unstable; urgency=low
was devided to parts: logger configuration script, applications.
-- Andriy Beregovenko <jet at jet.kiev.ua> Sat, 20 Nov 2011 18:24:48 +0300
-
diff --git a/debian/README.Debian b/debian/README.Debian
index 42f7077..0fcc3e4 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -10,35 +10,34 @@ RTMP, RTSP, RTP/RTCP, MPEG-TS, MMS.
1. New startup script system
----------------------------
Now all application configuration are placed in /etc/crtmpserver/applications.
-To enable any of them, simple add script base name(without .lua extention) to
-file /etc/crtmpserver/enabled_applications.conf.
+To enable any of them, simple add script base name(without .lua extention) to
+file /etc/crtmpserver/enabled_applications.conf.
Main configuration script now only generate config from parts. It load logger
-configuration script /etc/crtmpserver/log_appenders.lua, after this, script
-read file /etc/crtmpserver/enabled_applications.conf and load application
+configuration script /etc/crtmpserver/log_appenders.lua, after this, script
+read file /etc/crtmpserver/enabled_applications.conf and load application
scripts (using next filename form /etc/crtmpserver/applications/$name.lua)
-Also, now provided file /etc/defaults/crtmpserver for more comfortable daemon
+Also, now provided file /etc/defaults/crtmpserver for more comfortable daemon
maintaining.
-2. Change daemon user.
+2. Change daemon user.
-------------------------------
By default daemon run with root privileges, but you can change this behavior.
Next steps allows you to change daemon user:
a) Create system wide daemon user
- You must add system user for daemon. Something like this:
- adduser --system --disabled-login --ingroup adm \
- --home /var/lib/crtmpserver \
- --gecos crtmpserver \
- --shell /bin/false \
- crtmpserver
+ You must add system user for daemon. Something like this:
+ adduser --system --disabled-login --ingroup adm \
+ --home /var/lib/crtmpserver \
+ --gecos crtmpserver \
+ --shell /bin/false \
+ crtmpserver
b) Change daemon user
- Open rc configuration file /etc/defaults/crtmpserver, and
- change DAEMON_USER to created user name(in our case this is 'crtmpserver')
+ Open rc configuration file /etc/defaults/crtmpserver, and
+ change DAEMON_USER to created user name(in our case this is 'crtmpserver')
c) Restart daemon
- After all steps described above just do next:
- /etc/init.d/crtmpserver restart
-
+ After all steps described above just do next:
+ /etc/init.d/crtmpserver restart
diff --git a/debian/changelog b/debian/changelog
index 4419b9f..cbb5b20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,7 @@ crtmpserver (0.0~dfsg+svn611.1-1) unstable; urgency=low
crtmpserver-dev, crtmpserver.
* Add RC script and defaults file for it.
* A new configuration system, serving the configuration of the server.
- The system is based on the original configuration file that is divided
+ The system is based on the original configuration file that is divided
into parts (by applications and features). Read README.Debian for more
information.
diff --git a/debian/crtmpserver-apps-scripts/admin.lua b/debian/crtmpserver-apps-scripts/admin.lua
index b53cc28..6ba4b8d 100644
--- a/debian/crtmpserver-apps-scripts/admin.lua
+++ b/debian/crtmpserver-apps-scripts/admin.lua
@@ -1,23 +1,23 @@
application=
{
- name="admin",
- description="Application for administering",
- protocol="dynamiclinklibrary",
- aliases=
- {
- "admin_alias1",
- "admin_alias2",
- "admin_alias3",
- },
- acceptors =
- {
- {
- ip="0.0.0.0",
- port=1112,
- protocol="inboundJsonCli",
- useLengthPadding=true
- },
- }
- --validateHandshake=true,
- --default=true,
+ name="admin",
+ description="Application for administering",
+ protocol="dynamiclinklibrary",
+ aliases=
+ {
+ "admin_alias1",
+ "admin_alias2",
+ "admin_alias3",
+ },
+ acceptors =
+ {
+ {
+ ip="0.0.0.0",
+ port=1112,
+ protocol="inboundJsonCli",
+ useLengthPadding=true
+ },
+ }
+ --validateHandshake=true,
+ --default=true,
}
\ No newline at end of file
diff --git a/debian/crtmpserver-apps-scripts/applestreamingclient.lua b/debian/crtmpserver-apps-scripts/applestreamingclient.lua
index 906c98c..097946a 100644
--- a/debian/crtmpserver-apps-scripts/applestreamingclient.lua
+++ b/debian/crtmpserver-apps-scripts/applestreamingclient.lua
@@ -3,7 +3,7 @@ application=
name="applestreamingclient",
description="Apple Streaming Client",
protocol="dynamiclinklibrary",
- --[[acceptors =
+ --[[acceptors =
{
{
ip="0.0.0.0",
diff --git a/debian/crtmpserver-apps-scripts/appselector.lua b/debian/crtmpserver-apps-scripts/appselector.lua
index 3f585d6..22969e2 100644
--- a/debian/crtmpserver-apps-scripts/appselector.lua
+++ b/debian/crtmpserver-apps-scripts/appselector.lua
@@ -1,18 +1,18 @@
-application =
+application =
{
- -- The name of the application. It is mandatory and must be unique
+ -- The name of the application. It is mandatory and must be unique
name = "appselector",
-- Short description of the application. Optional
description = "Application for selecting the rest of the applications",
-- The type of the application. Possible values are:
-- dynamiclinklibrary - the application is a shared library
protocol = "dynamiclinklibrary",
- -- the complete path to the library. This is optional. If not provided,
+ -- the complete path to the library. This is optional. If not provided,
-- the server will try to load the library from here
-- <rootDirectory>/<name>/lib<name>.{so|dll|dylib}
-- library="/some/path/to/some/shared/library.so"
-
- -- Tells the server to validate the clien's handshake before going further.
+
+ -- Tells the server to validate the clien's handshake before going further.
-- It is optional, defaulted to true
validateHandshake = true,
-- this is the folder from where the current application gets it's content.
@@ -27,10 +27,10 @@ application =
-- "live",
--},
-- This flag designates the default application. The default application
- -- is responsable of analyzing the "connect" request and distribute
+ -- is responsable of analyzing the "connect" request and distribute
-- the future connection to the correct application.
default = true,
- acceptors =
+ acceptors =
{
{
ip = "0.0.0.0",
diff --git a/debian/crtmpserver-apps-scripts/flvplayback.lua b/debian/crtmpserver-apps-scripts/flvplayback.lua
index e93f0aa..51697dd 100644
--- a/debian/crtmpserver-apps-scripts/flvplayback.lua
+++ b/debian/crtmpserver-apps-scripts/flvplayback.lua
@@ -1,4 +1,4 @@
-application=
+application=
{
description="FLV Playback Sample",
name="flvplayback",
@@ -35,7 +35,7 @@ application=
usersFile="/etc/crtmpserver/conf.d/users.lua"
}
},
- acceptors =
+ acceptors =
{
{
ip="0.0.0.0",
@@ -60,7 +60,7 @@ application=
protocol="inboundRtsp"
},]]--
},
- externalStreams =
+ externalStreams =
{
-- Example streams
--[[{
diff --git a/debian/crtmpserver-apps-scripts/proxypublish.lua b/debian/crtmpserver-apps-scripts/proxypublish.lua
index 3a9eed8..a9deeff 100644
--- a/debian/crtmpserver-apps-scripts/proxypublish.lua
+++ b/debian/crtmpserver-apps-scripts/proxypublish.lua
@@ -5,7 +5,7 @@ application=
protocol="dynamiclinklibrary",
acceptors =
{
- {
+ {
ip="0.0.0.0",
port=6665,
protocol="inboundLiveFlv"
@@ -28,7 +28,7 @@ application=
},
},
--[[
- externalStreams =
+ externalStreams =
{
{
uri="rtsp://82.177.67.61/axis-media/media.amp",
diff --git a/debian/crtmpserver-apps-scripts/samplefactory.lua b/debian/crtmpserver-apps-scripts/samplefactory.lua
index f144864..a690005 100644
--- a/debian/crtmpserver-apps-scripts/samplefactory.lua
+++ b/debian/crtmpserver-apps-scripts/samplefactory.lua
@@ -7,7 +7,7 @@ application=
{
"httpOutboundTest"
},
- acceptors =
+ acceptors =
{
{
ip="0.0.0.0",
diff --git a/debian/crtmpserver-apps-scripts/stresstest.lua b/debian/crtmpserver-apps-scripts/stresstest.lua
index e3ea82a..a34d743 100644
--- a/debian/crtmpserver-apps-scripts/stresstest.lua
+++ b/debian/crtmpserver-apps-scripts/stresstest.lua
@@ -6,7 +6,7 @@ application=
targetServer="localhost",
targetApp="vod",
active=false,
- --[[streams =
+ --[[streams =
{
"lg00","lg01","lg02","lg03","lg04","lg05","lg06","lg07","lg08",
"lg09","lg10","lg11","lg12","lg13","lg14","lg15","lg16","lg17",
@@ -15,7 +15,7 @@ application=
"lg36","lg37","lg38","lg39","lg40","lg41","lg42","lg43","lg44",
"lg45","lg46","lg47","lg48","lg49"
},]]--
- streams =
+ streams =
{
"mp4:lg.mp4"
},
diff --git a/debian/crtmpserver-apps-scripts/vptests.lua b/debian/crtmpserver-apps-scripts/vptests.lua
index f99ad72..56c1b66 100644
--- a/debian/crtmpserver-apps-scripts/vptests.lua
+++ b/debian/crtmpserver-apps-scripts/vptests.lua
@@ -9,7 +9,7 @@ application=
"vptests_alias2",
"vptests_alias3",
},
- acceptors =
+ acceptors =
{
{
ip="0.0.0.0",
diff --git a/debian/crtmpserver-scripts/crtmpserver.lua b/debian/crtmpserver-scripts/crtmpserver.lua
index d286ca1..ce35858 100644
--- a/debian/crtmpserver-scripts/crtmpserver.lua
+++ b/debian/crtmpserver-scripts/crtmpserver.lua
@@ -9,32 +9,32 @@ logger_config_path = confdir.."/log_appenders.lua"
-- Print anything - including nested tables
function table_print (tt, indent, done)
- done = done or {}
- indent = indent or 0
- if type(tt) == "table" then
+ done = done or {}
+ indent = indent or 0
+ if type(tt) == "table" then
for key, value in pairs (tt) do
- io.write(string.rep (" ", indent)) -- indent it
- if type (value) == "table" and not done [value] then
- done [value] = true
- io.write(string.format("[%s] => table\n", tostring (key)));
- io.write(string.rep (" ", indent+4)) -- indent it
- io.write("(\n");
- table_print (value, indent + 7, done)
- io.write(string.rep (" ", indent+4)) -- indent it
- io.write(")\n");
- else
- io.write(string.format("[%s] => %s\n",
- tostring (key), tostring(value)))
- end
- end
- else
- io.write(tt .. "\n")
- end
+ io.write(string.rep (" ", indent)) -- indent it
+ if type (value) == "table" and not done [value] then
+ done [value] = true
+ io.write(string.format("[%s] => table\n", tostring (key)));
+ io.write(string.rep (" ", indent+4)) -- indent it
+ io.write("(\n");
+ table_print (value, indent + 7, done)
+ io.write(string.rep (" ", indent+4)) -- indent it
+ io.write(")\n");
+ else
+ io.write(string.format("[%s] => %s\n",
+ tostring (key), tostring(value)))
+ end
+ end
+ else
+ io.write(tt .. "\n")
+ end
end
function exists(fname)
local f = io.open(fname, "r")
- if (f) then
+ if (f) then
return true
else
return false
@@ -56,7 +56,7 @@ function read_applications()
local app_config
-- Must specify whre application libs can be found
result.rootDirectory = app_lib_path
-
+
-- Loads applications configuration listed in file "enabled_apps"
for app in io.lines(enabled_apps) do
app = (app:gsub("^%s*(.-)%s*$", "%1"))
--
crtmpserver packaging
More information about the pkg-multimedia-commits
mailing list