From db3610cefc1a855c051dd2c6fa47789709e10e2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Le=20Ninivin?= <cedric.leninivin@tiolive.com> Date: Fri, 30 Aug 2013 14:16:14 +0200 Subject: [PATCH] apache-frontend: implement hack to render template with two software types --- software/apache-frontend/instance-apache-frontend.cfg | 3 ++- .../apache-frontend/templates/apache-default-slave-list.cfg.in | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/software/apache-frontend/instance-apache-frontend.cfg b/software/apache-frontend/instance-apache-frontend.cfg index 411cb246b..6d02bcb7f 100644 --- a/software/apache-frontend/instance-apache-frontend.cfg +++ b/software/apache-frontend/instance-apache-frontend.cfg @@ -175,7 +175,8 @@ extra-context = raw template_slave_configuration ${template-default-slave-virtualhost:target} raw empty_template ${template-empty:target} raw template_rewrite_cached ${template-rewrite-cached:target} - raw software_type default + raw software_type default-RootSoftwareInstance +# XXXX Hack to allow two software types [dynamic-virtualhost-template-slave] <= jinja2-template-base diff --git a/software/apache-frontend/templates/apache-default-slave-list.cfg.in b/software/apache-frontend/templates/apache-default-slave-list.cfg.in index 858d95402..598ab50fb 100644 --- a/software/apache-frontend/templates/apache-default-slave-list.cfg.in +++ b/software/apache-frontend/templates/apache-default-slave-list.cfg.in @@ -1,4 +1,4 @@ -{% if software_type == slap_software_type -%} +{% if slap_software_type in software_type -%} {% set cached_server_dict = {} -%} {% set part_list = [] -%} -- 2.30.9