Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Łukasz Nowak
slapos
Commits
ef57d0ed
Commit
ef57d0ed
authored
13 years ago
by
Arnaud Fontaine
Browse files
Options
Download
Email Patches
Plain Diff
Allow to run erp5_update script manually, meaningful for production servers.
parent
14dbacca
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
6 deletions
+14
-6
slapos/recipe/erp5/__init__.py
slapos/recipe/erp5/__init__.py
+14
-6
No files found.
slapos/recipe/erp5/__init__.py
View file @
ef57d0ed
...
@@ -640,10 +640,14 @@ class Recipe(BaseSlapRecipe):
...
@@ -640,10 +640,14 @@ class Recipe(BaseSlapRecipe):
return
user
,
password
return
user
,
password
def
installERP5Site
(
self
,
user
,
password
,
zope_access
,
mysql_conf
,
def
installERP5Site
(
self
,
user
,
password
,
zope_access
,
mysql_conf
,
conversion_server_conf
=
None
,
memcached_conf
=
None
,
kumo_conf
=
None
,
conversion_server_conf
=
None
,
memcached_conf
=
None
,
erp5_site_id
=
'erp5'
,
default_bt5_list
=
[]):
kumo_conf
=
None
,
""" Create a script controlled by supervisor, which creates a erp5
erp5_site_id
=
'erp5'
,
default_bt5_list
=
[],
site on current available zope and mysql environment"""
supervisor_controlled
=
True
):
"""
Create a script to automatically set up an erp5 site (controlled by
supervisor by default) on available zope and mysql environments.
"""
conversion_server
=
None
conversion_server
=
None
if
conversion_server_conf
is
not
None
:
if
conversion_server_conf
is
not
None
:
conversion_server
=
"%s:%s"
%
(
conversion_server_conf
[
'conversion_server_ip'
],
conversion_server
=
"%s:%s"
%
(
conversion_server_conf
[
'conversion_server_ip'
],
...
@@ -660,7 +664,7 @@ class Recipe(BaseSlapRecipe):
...
@@ -660,7 +664,7 @@ class Recipe(BaseSlapRecipe):
bt5_repository_list
=
self
.
parameter_dict
.
get
(
"bt5_repository_list"
,
""
).
split
()
\
bt5_repository_list
=
self
.
parameter_dict
.
get
(
"bt5_repository_list"
,
""
).
split
()
\
or
getattr
(
self
,
'bt5_repository_list'
,
[])
or
getattr
(
self
,
'bt5_repository_list'
,
[])
s
elf
.
path_list
.
extend
(
zc
.
buildout
.
easy_install
.
scripts
([(
'erp5_update'
,
s
cript
=
zc
.
buildout
.
easy_install
.
scripts
([(
'erp5_update'
,
__name__
+
'.erp5'
,
'updateERP5'
)],
self
.
ws
,
__name__
+
'.erp5'
,
'updateERP5'
)],
self
.
ws
,
sys
.
executable
,
self
.
wrapper_directory
,
sys
.
executable
,
self
.
wrapper_directory
,
arguments
=
[
erp5_site_id
,
arguments
=
[
erp5_site_id
,
...
@@ -670,7 +674,11 @@ class Recipe(BaseSlapRecipe):
...
@@ -670,7 +674,11 @@ class Recipe(BaseSlapRecipe):
conversion_server
,
conversion_server
,
kumo_conf
.
get
(
"kumo_address"
),
kumo_conf
.
get
(
"kumo_address"
),
bt5_list
,
bt5_list
,
bt5_repository_list
]))
bt5_repository_list
])
if
supervisor_controlled
:
self
.
path_list
.
extend
(
script
)
return
[]
return
[]
def
installZeo
(
self
,
ip
):
def
installZeo
(
self
,
ip
):
...
...
This diff is collapsed.
Click to expand it.
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