summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/test.json9
-rw-r--r--templates/example/planet.xml8
2 files changed, 15 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" },
diff --git a/templates/example/planet.xml b/templates/example/planet.xml
index 547531c..a252477 100644
--- a/templates/example/planet.xml
+++ b/templates/example/planet.xml
@@ -1,6 +1,14 @@
<planet name="{{ globals.name }}">
<manager name="{{ globals.name }}">
+%% for name, value in globals.manager.items()
+%% if name != 'machine'
+ <property name="{{ name }}">{{ value }}</property>
+%% endif
+%% endfor
+ <component name="manager-bouncer" type="htpasswdcrypt-bouncer">
+ <property name="filename">{{ globals.passwdfile }}</property>
+ </component>
</manager>
<atmosphere>