summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2012-10-12 03:40:54 +0200
committerChristian Pointner <equinox@spreadspace.org>2012-10-12 03:40:54 +0200
commitc1f8319fd7aca71dbbda58a30a3180e613fa64c7 (patch)
tree5d388f072a9d78111dfd86b483b9db9825e804af /src
parentimproved worker sanity check (diff)
added manager config
Diffstat (limited to 'src')
-rw-r--r--src/test.json9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/test.json b/src/test.json
index 9f241fa..3342167 100644
--- a/src/test.json
+++ b/src/test.json
@@ -1,12 +1,17 @@
{
"globals":{
+ "version": "0.10.0",
"name": "elevate-live",
"description": "Live from Elevate Festival 2012",
"domain": "spreadspace.org",
"passwdfile": "/etc/flumotion/passwd",
"rrd-dir": "/var/lib/flumotion/rrd",
- "manager": "titan",
- "version": "0.10.0",
+ "manager": {
+ "machine": "titan",
+ "host": "89.106.215.48",
+ "port": 7531,
+ "transport": "ssl"
+ },
"resolutions": {
"720p25": { "width": 1280, "height": 720, "rate": "25/1" },
"480p25": { "width": 854, "height": 480, "rate": "25/1" },