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
Eric Zheng
slapos
Commits
d8f60f13
Commit
d8f60f13
authored
Oct 12, 2011
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ERP5: use socket access instead of TCP
parent
96f2393c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
3 deletions
+14
-3
slapos/recipe/erp5/__init__.py
slapos/recipe/erp5/__init__.py
+6
-1
slapos/recipe/vifib.py
slapos/recipe/vifib.py
+8
-2
No files found.
slapos/recipe/erp5/__init__.py
View file @
d8f60f13
...
...
@@ -789,7 +789,12 @@ SSLCARevocationPath %(ca_crl)s"""
kumo_conf
=
{}
# XXX Conversion server and memcache server coordinates are not relevant
# for pure site creation.
mysql_connection_string
=
"%(mysql_database)s@%(ip)s:%(tcp_port)s %(mysql_user)s %(mysql_password)s"
%
mysql_conf
assert
mysql_conf
[
'mysql_user'
]
and
mysql_conf
[
'mysql_password'
],
\
"ZMySQLDA requires a user and a password for socket connections"
# XXX Use socket access to prevent unwanted connections to original MySQL
# server when cloning an existing ERP5 instance.
# TCP will be required if MySQL is in a different partition/server.
mysql_connection_string
=
"%(mysql_database)s %(mysql_user)s %(mysql_password)s %(socket)s"
%
mysql_conf
bt5_list
=
self
.
parameter_dict
.
get
(
"bt5_list"
,
""
).
split
()
or
default_bt5_list
bt5_repository_list
=
self
.
parameter_dict
.
get
(
"bt5_repository_list"
,
""
).
split
()
\
...
...
slapos/recipe/vifib.py
View file @
d8f60f13
...
...
@@ -147,7 +147,10 @@ class Recipe(slapos.recipe.erp5.Recipe):
conversion_server_conf
,
# as installERP5Site is not trusted (yet) and this recipe is production
# ready expose more information
mysql_url
=
'%(mysql_database)s@%(ip)s:%(tcp_port)s %(mysql_user)s %(mysql_password)s'
%
mysql_conf
,
# XXX Use socket access to prevent unwanted connections to original MySQL
# server when cloning an existing ERP5 instance.
# TCP will be required if MySQL is in a different partition/server.
mysql_url
=
'%(mysql_database)s %(mysql_user)s %(mysql_password)s %(socket)s'
%
mysql_conf
,
))
return
self
.
path_list
...
...
@@ -200,7 +203,10 @@ class Recipe(slapos.recipe.erp5.Recipe):
conversion_server_conf
,
# as installERP5Site is not trusted (yet) and this recipe is production
# ready expose more information
mysql_url
=
'%(mysql_database)s@%(ip)s:%(tcp_port)s %(mysql_user)s %(mysql_password)s'
%
mysql_conf
,
# XXX Use socket access to prevent unwanted connections to original MySQL
# server when cloning an existing ERP5 instance.
# TCP will be required if MySQL is in a different partition/server.
mysql_url
=
'%(mysql_database)s %(mysql_user)s %(mysql_password)s %(socket)s'
%
mysql_conf
,
))
return
self
.
path_list
...
...
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