Jinja2-ify instance-sphinx.cfg .

software/erp5/instance-sphinx.cfg

-[buildout]
-parts =
-  publish-sphinx-url
-  sphinxd-instance
-
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-offline = true
-
-[publish-sphinx-url]
-recipe = slapos.cookbook:publish
-url-sphinx = sphinx://$${sphinxd-instance:ip}:$${sphinxd-instance:sphinx-port}
-url-sphinx-sql = mysql://$${sphinxd-instance:ip}:$${sphinxd-instance:sql-port}
-
-[sphinxd-instance]
-recipe = slapos.cookbook:sphinx
-data-directory = $${directory:sphinx-data}
-configuration-file = $${rootdirectory:etc}/sphinx.conf
-searchd-log = $${basedirectory:log}/sphinx-searchd.log
-query-log = $${basedirectory:log}/sphinx-query.log
-pid = $${basedirectory:run}/sphinx-searchd.pid
-ip = $${slap-network-information:local-ipv4}
-sphinx-port = 9312
-sql-port = 9306
-wrapper = $${basedirectory:services}/sphinxd
-sphinx-searchd-binary = ${sphinx:location}/bin/searchd
-
-[rootdirectory]
-recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc
-var = $${buildout:directory}/var
-srv = $${buildout:directory}/srv
-bin = $${buildout:directory}/bin
-
-[basedirectory]
-recipe = slapos.cookbook:mkdirectory
-log = $${rootdirectory:var}/log
-services = $${rootdirectory:etc}/run
-run = $${rootdirectory:var}/run
-
-[directory]
-recipe = slapos.cookbook:mkdirectory
-sphinx-data = $${rootdirectory:srv}/sphinx

software/erp5/instance-sphinx.cfg.in

+[buildout]
+parts =
+  publish-sphinx-url
+  sphinxd-instance
+
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
+
+[publish-sphinx-url]
+recipe = slapos.cookbook:publish
+url-sphinx = sphinx://${sphinxd-instance:ip}:${sphinxd-instance:sphinx-port}
+url-sphinx-sql = mysql://${sphinxd-instance:ip}:${sphinxd-instance:sql-port}
+
+[sphinxd-instance]
+recipe = slapos.cookbook:sphinx
+data-directory = ${directory:sphinx-data}
+configuration-file = ${rootdirectory:etc}/sphinx.conf
+searchd-log = ${basedirectory:log}/sphinx-searchd.log
+query-log = ${basedirectory:log}/sphinx-query.log
+pid = ${basedirectory:run}/sphinx-searchd.pid
+ip = ${slap-network-information:local-ipv4}
+sphinx-port = 9312
+sql-port = 9306
+wrapper = ${basedirectory:services}/sphinxd
+sphinx-searchd-binary = {{ sphinx_location }}/bin/searchd
+
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+etc = ${buildout:directory}/etc
+var = ${buildout:directory}/var
+srv = ${buildout:directory}/srv
+bin = ${buildout:directory}/bin
+
+[basedirectory]
+recipe = slapos.cookbook:mkdirectory
+log = ${rootdirectory:var}/log
+services = ${rootdirectory:etc}/run
+run = ${rootdirectory:var}/run
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+sphinx-data = ${rootdirectory:srv}/sphinx

software/erp5/instance.cfg

@@ -31,7 +31,7 @@ memcached = ${template-memcached:rendered}
 cloudooo = $${dynamic-template-cloudooo:output}
 zope = ${template-zope:output}
 mariadb = ${template-mariadb:rendered}
-sphinx = ${template-sphinx:output}
+sphinx = ${template-sphinx:rendered}
 tidstorage = $${dynamic-template-tidstorage:output}
 varnish = ${template-varnish:rendered}
 

software/erp5/software.cfg

@@ -73,11 +73,11 @@ extra-context =
     key xtrabackup_location xtrabackup:location
 
 [template-sphinx]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-sphinx.cfg
-md5sum = b6d196fb9014222dacef13a0d12a445d
-output = ${buildout:directory}/template-sphinx.cfg
-mode = 0644
+< = template-jinja2-base
+filename = instance-sphinx.cfg
+md5sum = e3975afd5220f251d6b6e7024a2ca08b
+extra-context =
+    key sphinx_location sphinx:location
 
 [template-zope]
 recipe = slapos.recipe.template