diff --git a/setup.py b/setup.py index 4f774b764b95cc06c990dd567e0a5359615a2cff..ee5771d3f0a53cb1da582c193f00b2b7658bb397 100644 --- a/setup.py +++ b/setup.py @@ -71,6 +71,7 @@ setup(name=name, 'lamp.simple = slapos.recipe.lamp:Simple', 'logrotate = slapos.recipe.logrotate:Recipe', 'logrotate.d = slapos.recipe.logrotate:Part', + 'publish = slapos.recipe.publish:Recipe', 'publishurl = slapos.recipe.publishurl:Recipe', 'proactive = slapos.recipe.proactive:Recipe', 'request = slapos.recipe.request:Recipe', diff --git a/slapos/recipe/generate_erp5_tidstorage.py b/slapos/recipe/generate_erp5_tidstorage.py index 09667a019c34c36b755e1cf90e2b6df3e1ae98a8..4462b259c112db0ba455b41064d5a6e89c7e67b1 100644 --- a/slapos/recipe/generate_erp5_tidstorage.py +++ b/slapos/recipe/generate_erp5_tidstorage.py @@ -27,7 +27,10 @@ from slapos.recipe.librecipe import GenericSlapRecipe import os import json +#url-%(backend_name)s = https://$${zope-instance:user}:$${zope-instance:password}@[$${apache-zope-backend-instance:ip}]:$${apache-zope-backend-instance:port} +SECTION_BACKEND_PUBLISHER = """[publish-apache-backend-list] +recipe = slapos.cookbook:publish""" ZOPE_PORT_BASE = 12000 ZEO_PORT_BASE = 15000 HAPROXY_PORT_BASE = 11000 @@ -106,6 +109,7 @@ class Recipe(GenericSlapRecipe): **zope_dict) # handle backend key snippet_backend = open(self.options['snippet-backend']).read() + publish_url_list = [] for backend_name, backend_configuration in json_data['backend'].iteritems(): haproxy_backend_list = [] for q in range(1, backend_configuration['zopecount'] + 1): @@ -127,7 +131,12 @@ class Recipe(GenericSlapRecipe): server_check_path='/%s/getId' % site_id, haproxy_backend_list=' '.join(haproxy_backend_list) ) + publish_url_list.append('url-%(backend_name)s = https://[${apache-%(backend_name)s:ip}]:${apache-%(backend_name)s:port}' % dict( + backend_name=backend_name)) output += snippet_backend % backend_dict + output += SECTION_BACKEND_PUBLISHER + '\n' + output += '\n'.join(publish_url_list) + part_list.append('publish-apache-backend-list') prepend = open(self.options['snippet-master']).read() % dict( part_list=' \n'.join([' '+q for q in part_list])) output = prepend + output diff --git a/slapos/recipe/publish.py b/slapos/recipe/publish.py new file mode 100644 index 0000000000000000000000000000000000000000..ca0d81c606142da565de6aa16b04a5672b721734 --- /dev/null +++ b/slapos/recipe/publish.py @@ -0,0 +1,38 @@ +############################################################################## +# +# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved. +# +# WARNING: This program as such is intended to be used by professional +# programmers who take the whole responsibility of assessing all potential +# consequences resulting from its eventual inadequacies and bugs +# End users who are looking for a ready-to-use solution with commercial +# guarantees and support are strongly adviced to contract a Free Software +# Service Company +# +# This program is Free Software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 3 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +############################################################################## +import zc.buildout + +from slapos.recipe.librecipe import GenericSlapRecipe + +class Recipe(GenericSlapRecipe): + def _install(self): + publish_dict = dict() + for k, v in self.options.iteritems(): + if k.startswith('url'): + publish_dict[k] = v + self.setConnectionDict(publish_dict) + return []