summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Pokorný <jpokorny@redhat.com>2015-04-08 15:04:43 +0200
committerJan Pokorný <jpokorny@redhat.com>2015-04-08 19:56:23 +0200
commitf0858f39adcb99f349eef5b9ebd2ec5b29bdb4f5 (patch)
tree0266ea615b6299dbbde4d80665ccf4684e445d79
parent9b34a9385092d6540a55fa104f88feba27cf4aa9 (diff)
downloadclufter-f0858f39adcb99f349eef5b9ebd2ec5b29bdb4f5.tar.gz
clufter-f0858f39adcb99f349eef5b9ebd2ec5b29bdb4f5.tar.xz
clufter-f0858f39adcb99f349eef5b9ebd2ec5b29bdb4f5.zip
filters/ccsflat2cibprelude[apache]: special-case configfile
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
-rw-r--r--filters/cluster/rm/apache/__init__.py16
1 files changed, 15 insertions, 1 deletions
diff --git a/filters/cluster/rm/apache/__init__.py b/filters/cluster/rm/apache/__init__.py
index 394f54c..8e393dd 100644
--- a/filters/cluster/rm/apache/__init__.py
+++ b/filters/cluster/rm/apache/__init__.py
@@ -17,9 +17,23 @@ ccsflat2cibprelude = '''\
) + '''
<!-- INSTANCE_ATTRIBUTES -->
<instance_attributes id="{concat($Prefix, '-ATTRS')}">
+
+ <!-- configfile ~ (server_root + '/' +) config_file -->
+ <xsl:choose>
+ <xsl:when test="starts-with(@config_file, '/')">
+''' + (
+ rg2hb_xsl('configfile', 'config_file', req=True)
+) + '''\
+ </xsl:when>
+ <xsl:otherwise>
''' + (
- rg2hb_xsl('configfile', 'config_file')
+ rg2hb_xsl('configfile',
+ "{concat(@server_root, '/', @config_file)}",
+ req=abs)
) + '''\
+ </xsl:otherwise>
+ </xsl:choose>
+
<!-- options ~ httpd_options (if present; + name, server_root) -->
<nvpair id="{concat($Prefix, '-ATTRS-options')}"
name="options">