[SCM] crtmpserver/master: Rename scripts back :)
jet-guest at users.alioth.debian.org
jet-guest at users.alioth.debian.org
Sun Nov 6 09:31:36 UTC 2011
The following commit has been merged in the master branch:
commit fdd3d646a8b08bfa6dd74577aa2ca60e06d576d1
Author: Andriy Beregovenko <jet at jet.kiev.ua>
Date: Sun Nov 6 11:29:38 2011 +0200
Rename scripts back :)
diff --git a/debian/crtmpserver-apps-scripts/admin.lua.sample b/debian/crtmpserver-apps-scripts/admin.lua
similarity index 100%
rename from debian/crtmpserver-apps-scripts/admin.lua.sample
rename to debian/crtmpserver-apps-scripts/admin.lua
diff --git a/debian/crtmpserver-apps-scripts/applestreamingclient.lua.sample b/debian/crtmpserver-apps-scripts/applestreamingclient.lua
similarity index 100%
rename from debian/crtmpserver-apps-scripts/applestreamingclient.lua.sample
rename to debian/crtmpserver-apps-scripts/applestreamingclient.lua
diff --git a/debian/crtmpserver-apps-scripts/appselector.lua.sample b/debian/crtmpserver-apps-scripts/appselector.lua
similarity index 100%
rename from debian/crtmpserver-apps-scripts/appselector.lua.sample
rename to debian/crtmpserver-apps-scripts/appselector.lua
diff --git a/applications/flvplayback/users.lua b/debian/crtmpserver-apps-scripts/conf.d/users.lua
similarity index 100%
copy from applications/flvplayback/users.lua
copy to debian/crtmpserver-apps-scripts/conf.d/users.lua
diff --git a/debian/crtmpserver-apps-scripts/conf.d/users.lua.sample b/debian/crtmpserver-apps-scripts/conf.d/users.lua.sample
deleted file mode 100644
index 21193b5..0000000
--- a/debian/crtmpserver-apps-scripts/conf.d/users.lua.sample
+++ /dev/null
@@ -1,32 +0,0 @@
-users=
-{
- broadcast="vbrick",
- user1="password1",
- user2="password2",
- user3="password3",
- gigi="spaima",
- a="a",
-}
-
-realms=
-{
- {
- name="My realm...",
- method="Digest",
- users={
- "user1",
- "user3"
- },
- },
- {
- name="My second realm...",
- method="Basic",
- users={
- "user2",
- "broadcast",
- "user1",
- "gigi"
- },
- }
-}
-
diff --git a/debian/crtmpserver-apps-scripts/flvplayback.lua.sample b/debian/crtmpserver-apps-scripts/flvplayback.lua
similarity index 100%
rename from debian/crtmpserver-apps-scripts/flvplayback.lua.sample
rename to debian/crtmpserver-apps-scripts/flvplayback.lua
diff --git a/debian/crtmpserver-apps-scripts/proxypublish.lua.sample b/debian/crtmpserver-apps-scripts/proxypublish.lua
similarity index 100%
rename from debian/crtmpserver-apps-scripts/proxypublish.lua.sample
rename to debian/crtmpserver-apps-scripts/proxypublish.lua
diff --git a/debian/crtmpserver-apps-scripts/samplefactory.lua.sample b/debian/crtmpserver-apps-scripts/samplefactory.lua
similarity index 100%
rename from debian/crtmpserver-apps-scripts/samplefactory.lua.sample
rename to debian/crtmpserver-apps-scripts/samplefactory.lua
diff --git a/debian/crtmpserver-apps-scripts/stresstest.lua.sample b/debian/crtmpserver-apps-scripts/stresstest.lua
similarity index 100%
rename from debian/crtmpserver-apps-scripts/stresstest.lua.sample
rename to debian/crtmpserver-apps-scripts/stresstest.lua
diff --git a/debian/crtmpserver-apps-scripts/vptests.lua.sample b/debian/crtmpserver-apps-scripts/vptests.lua
similarity index 100%
rename from debian/crtmpserver-apps-scripts/vptests.lua.sample
rename to debian/crtmpserver-apps-scripts/vptests.lua
--
crtmpserver packaging
More information about the pkg-multimedia-commits
mailing list