Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Paul Graydon
slapos
Commits
a24faca6
Commit
a24faca6
authored
Jun 13, 2011
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'vifib' into erp5
parents
e7c338c2
18e066a3
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
56 additions
and
2 deletions
+56
-2
slapos/recipe/erp5/__init__.py
slapos/recipe/erp5/__init__.py
+2
-0
slapos/recipe/erp5/template/site.zcml
slapos/recipe/erp5/template/site.zcml
+3
-2
slapos/recipe/vifib.py
slapos/recipe/vifib.py
+4
-0
software/vifib/software.cfg
software/vifib/software.cfg
+31
-0
stack/erp5.cfg
stack/erp5.cfg
+16
-0
No files found.
slapos/recipe/erp5/__init__.py
View file @
a24faca6
...
...
@@ -794,6 +794,8 @@ class Recipe(BaseSlapRecipe):
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
,
suffix
=
''
,
access_control_string
=
None
):
...
...
slapos/recipe/erp5/template/site.zcml
View file @
a24faca6
...
...
@@ -3,10 +3,10 @@
xmlns:meta="http://namespaces.zope.org/meta"
xmlns:five="http://namespaces.zope.org/five">
<include package="Zope2.App" />
<include package="Products.Five" />
<meta:redefinePermission from="zope2.Public" to="zope.Public" />
<!-- Load the meta -->
<include files="package-includes/*-meta.zcml" />
<five:loadProducts file="meta.zcml"/>
...
...
@@ -19,7 +19,8 @@
<includeOverrides files="package-includes/*-overrides.zcml" />
<five:loadProductsOverrides />
<securityPolicy
component="
AccessControl.security.
SecurityPolicy" />
component="
Products.Five.security.Five
SecurityPolicy" />
</configure>
slapos/recipe/vifib.py
View file @
a24faca6
...
...
@@ -147,6 +147,9 @@ SSLCARevocationPath %(ca_crl)s"""
login_url_list
)
apache_login
=
self
.
installBackendApache
(
self
.
getGlobalIPv6Address
(),
15000
,
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)
service_url_list
=
[]
for
i
in
(
1
,
2
,
3
,
4
):
...
...
@@ -170,6 +173,7 @@ SSLCARevocationPath %(ca_crl)s"""
known_tid_storage_identifier_dict
,
'http://'
+
login_haproxy
)
self
.
linkBinary
()
self
.
setConnectionDict
(
dict
(
front_end_url
=
apache_frontend_login
,
site_url
=
apache_login
,
site_user
=
user
,
site_password
=
password
,
...
...
software/vifib/software.cfg
0 → 100644
View file @
a24faca6
[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
stack/erp5.cfg
View file @
a24faca6
...
...
@@ -9,6 +9,22 @@ find-links =
http://dist.repoze.org
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 =
# Exact version of Zope
http://svn.zope.org/repos/main/Zope/tags/2.12.18/versions.cfg
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment