diff --git a/slapos/recipe/erp5/setup.py b/slapos/recipe/erp5/setup.py index 5cd5cf03d661759f01decd4214b867060523d457..3441901c642b406b342daec951edebc25d96ac51 100644 --- a/slapos/recipe/erp5/setup.py +++ b/slapos/recipe/erp5/setup.py @@ -6,7 +6,7 @@ from setuptools import setup, find_packages # "."], stdout=subprocess.PIPE).communicate()[0])) name = "slapos.recipe.erp5" -version = '1.1-dev-179' +version = '1.1-dev-180' def read(name): return open(name).read() diff --git a/slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py b/slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py index 6ab5988cd1e377b314ba8c9292e1d1f437391601..8199df3673412a6f5ee8a797d031dcabc47e1d45 100644 --- a/slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py +++ b/slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py @@ -80,7 +80,7 @@ class Recipe(BaseSlapRecipe): dict(zodb_root_path=zodb_root_path)), with_timerservice=True) key, certificate = self.requestCertificate('Login Based Access') apache_conf = dict( - apache_login=self.installLoginApache(ip=self.getGlobalIPv6Address(), + apache_login=self.installBackendApache(ip=self.getGlobalIPv6Address(), port=13000, backend=zope_access, key=key, certificate=certificate)) self.installERP5Site(user, password, zope_access, mysql_conf, conversion_server_conf, memcached_conf, kumo_conf, self.site_id) @@ -724,7 +724,7 @@ class Recipe(BaseSlapRecipe): 'template/apache.zope.conf.in') % apache_conf return self.createConfigurationFile(prefix + '.conf', apache_conf_string) - def installLoginApache(self, ip, port, backend, key, certificate, + def installBackendApache(self, ip, port, backend, key, certificate, suffix='', access_control_string=None): ssl_template = """SSLEngine on SSLCertificateFile %(login_certificate)s