Commit 1e984809 authored by Gabriel Monnerat's avatar Gabriel Monnerat

add path of varnish binary and fix parentheses

parent cf0991c8
...@@ -266,26 +266,24 @@ class Recipe(BaseSlapRecipe): ...@@ -266,26 +266,24 @@ class Recipe(BaseSlapRecipe):
directory=directory, directory=directory,
pid = "%s/varnish.pid" % directory, pid = "%s/varnish.pid" % directory,
port="%s:%s" % (ip, port), port="%s:%s" % (ip, port),
varnishd_binary=self.options["varnishd_binary"],
control_port="%s:%s" % (ip, control_port), control_port="%s:%s" % (ip, control_port),
storage="file,%s/storage.bin,%s" % (directory, size)) storage="file,%s/storage.bin,%s" % (directory, size))
config_file = self.createConfigurationFile("%s.conf" % name, config_file = self.createConfigurationFile("%s.conf" % name,
self.substituteTemplate(self.getTemplateFilename( self.substituteTemplate(self.getTemplateFilename('varnish.vcl.in'),
'varnish.vcl.in', dict( dict(backend_host=backend_host,backend_port=backend_port)))
backend_host=backend_host,
backend_port=backend_port))))
varnish_config["configuration_file"] = config_file varnish_config["configuration_file"] = config_file
self.path_list.append(self.createRunningWrapper('varnishd', self.path_list.append(self.createRunningWrapper('varnishd',
self.substituteTemplate(self.getTemplateFilename('varnishd.in'), self.substituteTemplate(self.getTemplateFilename('varnishd.in'),
config))) varnish_config)))
return varnish_config return varnish_config
def installStunnel(self, service_dict, ca_certificate, key, ca_crl, ca_path): def installStunnel(self, service_dict, ca_certificate, key, ca_crl, ca_path):
"""Installs stunnel """Installs stunnel
service_dict = \ service_dict =
{ name: (public_ip, private_ip, public_port, private_port),} { name: (public_ip, private_ip, public_port, private_port),}
""" """
template_filename = self.getTemplateFilename('stunnel.conf.in') template_filename = self.getTemplateFilename('stunnel.conf.in')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment