summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorequinox <equinox@88d0365b-309c-4eec-8061-d8e0c04ad69e>2012-09-15 11:26:16 +0000
committerequinox <equinox@88d0365b-309c-4eec-8061-d8e0c04ad69e>2012-09-15 11:26:16 +0000
commitdd7642b15d0144b5a9ee2154761b7094ec204721 (patch)
tree0ddf9bfede791601837b1a91199748f75d526830
parentadded sample json file (diff)
cleanup test.json
git-svn-id: https://svn.spreadspace.org/flufigut/trunk@5 88d0365b-309c-4eec-8061-d8e0c04ad69e
-rw-r--r--src/test.json25
1 files changed, 10 insertions, 15 deletions
diff --git a/src/test.json b/src/test.json
index 190b169..a498523 100644
--- a/src/test.json
+++ b/src/test.json
@@ -1,6 +1,5 @@
{
- "globals":
- {
+ "globals":{
"name": "test",
"passwdfile": "/etc/flumotion/passwd",
"manager": "titan",
@@ -11,25 +10,21 @@
"calypso": [ "encoder-h264" ],
"telesto": [ "encoder-vp8" ]
},
- "atmosphere":
- {
- "myporter":
- {
+ "atmosphere": {
+ "myporter": {
"worker": "localhost",
"type": "porter",
- "parameter":
- {
+ "desc": "hello world",
+ "parameter": {
}
}
},
- "flow":
- {
- "rawinput":
- {
- "worker": "localhost",
+ "flow": {
+ "rawinput": {
+ "worker": "input",
"type": "firewireav",
- "parameter":
- {
+ "desc": "da kommst rein",
+ "parameter": {
}
}
}