Apache recipe : Remove trailing spaces

parent cea655bd
...@@ -134,9 +134,9 @@ class Recipe(BaseSlapRecipe): ...@@ -134,9 +134,9 @@ class Recipe(BaseSlapRecipe):
ca_conf["certificate_authority_path"]) ca_conf["certificate_authority_path"])
apache_parameter_dict = self.installFrontendApache( apache_parameter_dict = self.installFrontendApache(
ip_list=["[%s]" % self.getGlobalIPv6Address(), ip_list=["[%s]" % self.getGlobalIPv6Address(),
self.getLocalIPv4Address()], self.getLocalIPv4Address()],
port=frontend_port_number, port=frontend_port_number,
name=frontend_domain_name, name=frontend_domain_name,
rewrite_rule_list=rewrite_rule_list, rewrite_rule_list=rewrite_rule_list,
key=key, certificate=certificate) key=key, certificate=certificate)
...@@ -146,7 +146,7 @@ class Recipe(BaseSlapRecipe): ...@@ -146,7 +146,7 @@ class Recipe(BaseSlapRecipe):
self.setConnectionDict( self.setConnectionDict(
dict(site_url=apache_parameter_dict["site_url"], dict(site_url=apache_parameter_dict["site_url"],
domain_ipv6_address=self.getGlobalIPv6Address(), domain_ipv6_address=self.getGlobalIPv6Address(),
domain_ipv4_address=self.getLocalIPv4Address())) domain_ipv4_address=self.getLocalIPv4Address()))
return self.path_list return self.path_list
...@@ -344,7 +344,7 @@ class Recipe(BaseSlapRecipe): ...@@ -344,7 +344,7 @@ class Recipe(BaseSlapRecipe):
{ 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')
template_entry_filename = self.getTemplateFilename('stunnel.conf.entry.in') template_entry_filename = self.getTemplateFilename('stunnel.conf.entry.in')
log = os.path.join(self.log_directory, 'stunnel.log') log = os.path.join(self.log_directory, 'stunnel.log')
pid_file = os.path.join(self.run_directory, 'stunnel.pid') pid_file = os.path.join(self.run_directory, 'stunnel.pid')
......
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