Commit a24faca6 authored by Łukasz Nowak's avatar Łukasz Nowak

Merge branch 'vifib' into erp5

parents e7c338c2 18e066a3
...@@ -794,6 +794,8 @@ class Recipe(BaseSlapRecipe): ...@@ -794,6 +794,8 @@ class Recipe(BaseSlapRecipe):
config=apache_config_file config=apache_config_file
) )
])) ]))
# Note: IPv6 is assumed always
return 'https://[%(ip)s]:%(port)s' % apache_conf
def installBackendApache(self, ip, port, backend, key, certificate, def installBackendApache(self, ip, port, backend, key, certificate,
suffix='', access_control_string=None): suffix='', access_control_string=None):
......
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
xmlns:meta="http://namespaces.zope.org/meta" xmlns:meta="http://namespaces.zope.org/meta"
xmlns:five="http://namespaces.zope.org/five"> xmlns:five="http://namespaces.zope.org/five">
<include package="Zope2.App" />
<include package="Products.Five" /> <include package="Products.Five" />
<meta:redefinePermission from="zope2.Public" to="zope.Public" /> <meta:redefinePermission from="zope2.Public" to="zope.Public" />
<!-- Load the meta --> <!-- Load the meta -->
<include files="package-includes/*-meta.zcml" /> <include files="package-includes/*-meta.zcml" />
<five:loadProducts file="meta.zcml"/> <five:loadProducts file="meta.zcml"/>
...@@ -19,7 +19,8 @@ ...@@ -19,7 +19,8 @@
<includeOverrides files="package-includes/*-overrides.zcml" /> <includeOverrides files="package-includes/*-overrides.zcml" />
<five:loadProductsOverrides /> <five:loadProductsOverrides />
<securityPolicy <securityPolicy
component="AccessControl.security.SecurityPolicy" /> component="Products.Five.security.FiveSecurityPolicy" />
</configure> </configure>
...@@ -147,6 +147,9 @@ SSLCARevocationPath %(ca_crl)s""" ...@@ -147,6 +147,9 @@ SSLCARevocationPath %(ca_crl)s"""
login_url_list) login_url_list)
apache_login = self.installBackendApache(self.getGlobalIPv6Address(), 15000, apache_login = self.installBackendApache(self.getGlobalIPv6Address(), 15000,
login_haproxy, backend_key, backend_certificate) login_haproxy, backend_key, backend_certificate)
apache_frontend_login = self.installFrontendZopeApache(
self.getGlobalIPv6Address(), 4443, 'vifib', '/',
apache_login, '/', backend_key, backend_certificate)
# Four Web Service Nodes (Machine access) # Four Web Service Nodes (Machine access)
service_url_list = [] service_url_list = []
for i in (1, 2, 3, 4): for i in (1, 2, 3, 4):
...@@ -170,6 +173,7 @@ SSLCARevocationPath %(ca_crl)s""" ...@@ -170,6 +173,7 @@ SSLCARevocationPath %(ca_crl)s"""
known_tid_storage_identifier_dict, 'http://'+login_haproxy) known_tid_storage_identifier_dict, 'http://'+login_haproxy)
self.linkBinary() self.linkBinary()
self.setConnectionDict(dict( self.setConnectionDict(dict(
front_end_url=apache_frontend_login,
site_url=apache_login, site_url=apache_login,
site_user=user, site_user=user,
site_password=password, site_password=password,
......
[buildout]
extends =
../erp5/software.cfg
parts +=
vifib
[eggs]
eggs += slapos.core
[instance-recipe]
egg = slapos.cookbook
module = vifib
[vifib]
# Recipe zerokspot.recipe.git is disabled, as is not possible to change its
# environment to use localy delivered git.
# plone.recipe.command can do same job, but it is controllable which binary
# will be used
recipe = plone.recipe.command
location = ${buildout:parts-directory}/${:_buildout_section_name_}
stop-on-error = true
repository = http://git.erp5.org/repos/slapos.core.git
command = ${git:location}/bin/git clone --quiet ${:repository} ${:location}
update-command = cd ${:location} && ${git:location}/bin/git pull --quiet
[products]
# XXX: Lack of eggification workaround
# list of products, possible to extend, it is passed in reversed way
# to allow overriding during extending profile
list = ${products-deps:location} ${erp5:location}/product ${vifib:location}/master/product
...@@ -9,6 +9,22 @@ find-links = ...@@ -9,6 +9,22 @@ find-links =
http://dist.repoze.org http://dist.repoze.org
http://www.nexedi.org/static/packages/source/ http://www.nexedi.org/static/packages/source/
# Separate from site eggs
allowed-eggs-from-site-packages =
include-site-packages = false
exec-sitecustomize = false
# Use only quite well working sites.
allow-hosts =
*.nexedi.org
*.python.org
*.sourceforge.net
dist.repoze.org
effbot.org
github.com
psutil.googlecode.com
www.dabeaz.com
extends = extends =
# Exact version of Zope # Exact version of Zope
http://svn.zope.org/repos/main/Zope/tags/2.12.18/versions.cfg http://svn.zope.org/repos/main/Zope/tags/2.12.18/versions.cfg
......
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