[SCM] crtmpserver/master: Install application cofngis as example, and while postinstall stage "configure" copy it to etc if not exists already.

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

The following commit has been merged in the master branch:
commit 792b2bf5dec3ec79aab2066ac6ab70a816cd60a8
Author: Andriy Beregovenko <jet at jet.kiev.ua>
Date:   Sun Nov 6 11:30:19 2011 +0200

    Install application cofngis as example, and while postinstall stage
    "configure" copy it to etc if not exists already.

diff --git a/debian/crtmpserver-apps.examples b/debian/crtmpserver-apps.examples
new file mode 100644
index 0000000..f77f311
--- /dev/null
+++ b/debian/crtmpserver-apps.examples
@@ -0,0 +1,9 @@
+debian/crtmpserver-apps-scripts/admin.lua
+debian/crtmpserver-apps-scripts/applestreamingclient.lua
+debian/crtmpserver-apps-scripts/appselector.lua
+debian/crtmpserver-apps-scripts/flvplayback.lua
+debian/crtmpserver-apps-scripts/proxypublish.lua
+debian/crtmpserver-apps-scripts/samplefactory.lua
+debian/crtmpserver-apps-scripts/stresstest.lua
+debian/crtmpserver-apps-scripts/vptests.lua
+debian/crtmpserver-apps-scripts/conf.d/users.lua
diff --git a/debian/crtmpserver-apps.install b/debian/crtmpserver-apps.install
index 02d176f..c46c72f 100644
--- a/debian/crtmpserver-apps.install
+++ b/debian/crtmpserver-apps.install
@@ -7,12 +7,3 @@ usr/lib/crtmpserver/applications/proxypublish/libproxypublish.so
 usr/lib/crtmpserver/applications/samplefactory/libsamplefactory.so
 usr/lib/crtmpserver/applications/stresstest/libstresstest.so
 usr/lib/crtmpserver/applications/vptests/libvptests.so
-debian/crtmpserver-apps-scripts/admin.lua..sample	etc/crtmpserver/applications
-debian/crtmpserver-apps-scripts/applestreamingclient.lua.sample	etc/crtmpserver/applications
-debian/crtmpserver-apps-scripts/appselector.lua.sample	etc/crtmpserver/applications
-debian/crtmpserver-apps-scripts/flvplayback.lua.sample	etc/crtmpserver/applications
-debian/crtmpserver-apps-scripts/proxypublish.lua.sample	etc/crtmpserver/applications
-debian/crtmpserver-apps-scripts/samplefactory.lua.sample	etc/crtmpserver/applications
-debian/crtmpserver-apps-scripts/stresstest.lua.sample	etc/crtmpserver/applications
-debian/crtmpserver-apps-scripts/vptests.lua.sample	etc/crtmpserver/applications
-debian/crtmpserver-apps-scripts/conf.d/users.lua.sample	etc/crtmpserver/conf.d
diff --git a/debian/crtmpserver-apps.postinst b/debian/crtmpserver-apps.postinst
index 1c6507d..2afb85e 100644
--- a/debian/crtmpserver-apps.postinst
+++ b/debian/crtmpserver-apps.postinst
@@ -1,18 +1,16 @@
-#!/bin/sh
+#! /bin/sh
 
 set -e
 
 APPLICATIONS="admin applestreamingclient appselector flvplayback proxypublish samplefactory stresstest vptests"
-APPCONFPATH="/etc/crtmpserver/applications"
-
 
 case "$1" in
 	configure)
 		# Copy application config if not exists
-		for app in "$APPLICATIONS"; do
+		for app in $APPLICATIONS; do
 			if [ ! -f /etc/crtmpserver/applications/${app}.lua ]
 			then
-				cp /etc/crtmpserver/applications/${app}.lua.sample \
+				cp /usr/share/doc/crtmpserver-apps/examples/${app}.lua \
 					/etc/crtmpserver/applications/${app}.lua
 				chmod 644 /etc/crtmpserver/applications/${app}.lua
 			fi
@@ -21,7 +19,7 @@ case "$1" in
 		# copy users sample file if not exists
 		if [ ! -f /etc/crtmpserver/conf.d/users.lua ]
 		then
-			cp /etc/crtmpserver/conf.d/users.lua.sample \
+			cp /usr/share/doc/crtmpserver-apps/examples/users.lua \
 				/etc/crtmpserver/conf.d/users.lua
 			chmod 640 /etc/crtmpserver/conf.d/users.lua
 		fi

-- 
crtmpserver packaging