diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2012-10-12 17:24:14 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2012-10-12 17:24:14 +0200 |
| commit | f28b7d13ce9dc83dc336ba1fb300470fa30bb4fb (patch) | |
| tree | 13690f97283d3c20b1cdad73c234c62159cc9e77 /templates | |
| parent | also creating passwd file (diff) | |
some bug fixes (first working version of config)
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/example/http-stream.xml | 10 | ||||
| -rw-r--r-- | templates/example/planet.xml | 2 | ||||
| -rw-r--r-- | templates/example/worker.xml | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/templates/example/http-stream.xml b/templates/example/http-stream.xml index 8027b9f..561097a 100644 --- a/templates/example/http-stream.xml +++ b/templates/example/http-stream.xml @@ -7,10 +7,12 @@ <eater name="default"> <feed alias="default">{{ component.feeder }}</feed> </eater> - <plug socket="flumotion.component.plugs.rrd.ComponentRRDPlug" type="component-rrd"> - <property name="clients-connected-file">{{ component.rrd_clients }}</property> - <property name="bytes-transferred-file">{{ component.rrd_bytes }}</property> - </plug> + <plugs> + <plug socket="flumotion.component.plugs.rrd.ComponentRRDPlug" type="component-rrd"> + <property name="clients-connected-file">{{ component.rrd_clients }}</property> + <property name="bytes-transferred-file">{{ component.rrd_bytes }}</property> + </plug> + </plugs> %% for name, value in component.properties.items() %% if name != 'samplerate' <property name="{{ name }}">{{ value }}</property> diff --git a/templates/example/planet.xml b/templates/example/planet.xml index 6c6b4bb..454b1bb 100644 --- a/templates/example/planet.xml +++ b/templates/example/planet.xml @@ -4,7 +4,7 @@ <manager name="{{ globals.name }}"> %% for name, value in globals.manager.items() %% if name != 'machine' - <property name="{{ name }}">{{ value }}</property> + <{{ name }}>{{ value }}</{{ name }}> %% endif %% endfor <component name="manager-bouncer" type="htpasswdcrypt-bouncer"> diff --git a/templates/example/worker.xml b/templates/example/worker.xml index cd9ee5c..b6f4667 100644 --- a/templates/example/worker.xml +++ b/templates/example/worker.xml @@ -14,7 +14,7 @@ </authentication> <feederports>{{ portrange }}</feederports> -%% if debug != '' +%% if debug and debug != '' <debug>{{ debug }}</debug> %% endif </worker> |