From 61b341e40961770b285725cecafbc28de95054fe Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sun, 4 Feb 2018 03:40:13 +0100
Subject: change handling of flags

---
 templates/default/flumotion/planet.xml.j2   | 12 ++++++------
 templates/default/flumotion/recorder.xml.j2 |  4 ++++
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'templates/default/flumotion')

diff --git a/templates/default/flumotion/planet.xml.j2 b/templates/default/flumotion/planet.xml.j2
index cac9fc0..5c2575c 100644
--- a/templates/default/flumotion/planet.xml.j2
+++ b/templates/default/flumotion/planet.xml.j2
@@ -2,19 +2,19 @@
 <planet name="{{ globals.name }}">
 
   <manager name="{{ globals.name }}">
-{%- if globals.deployment.type == "kubernetes" %}
+%% if globals.deployment.type == "kubernetes"
     <host>0.0.0.0</host>
-{%- else %}
+%% else
     <host>{{ globals.manager.host }}</host>
-{%- endif %}
+%% endif
     <port>{{ globals.manager.port }}</port>
     <transport>{{ globals.manager.transport }}</transport>
     <component name="manager-bouncer" type="htpasswdcrypt-bouncer">
-{%- if globals.deployment.type == "kubernetes" %}
+%% if globals.deployment.type == "kubernetes"
       <property name="filename">/srv/secret/htpasswd</property>
-{%- else %}
+%% else
       <property name="filename">/etc/flumotion/{{ globals.name }}.passwd</property>
-{%- endif %}
+%% endif
     </component>
   </manager>
 
diff --git a/templates/default/flumotion/recorder.xml.j2 b/templates/default/flumotion/recorder.xml.j2
index b2fce9e..2634978 100644
--- a/templates/default/flumotion/recorder.xml.j2
+++ b/templates/default/flumotion/recorder.xml.j2
@@ -8,7 +8,11 @@
           <feed alias="default">{{ component.feeder }}</feed>
         </eater>
 %% for name, value in component.properties.items()
+%%   if globals.deployment.type == "kubernetes" and name == "directory"
+        <property name="{{ name }}">/srv/recordings/{{ component._recorder_id }}</property>
+%%   else
         <property name="{{ name }}">{{ value }}</property>
+%%   endif
 %% endfor
         <clock-master>false</clock-master>
     </component>
-- 
cgit v1.2.3