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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jean-Paul Smets
slapos
Commits
06814005
Commit
06814005
authored
Jun 24, 2011
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Mysql : Changing from slapos.recipe.erp5.execute to slapos.recipe.librecipe.execute
parent
e1d0a32e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
7 deletions
+4
-7
slapos/recipe/mysql/__init__.py
slapos/recipe/mysql/__init__.py
+4
-7
No files found.
slapos/recipe/mysql/__init__.py
View file @
06814005
...
@@ -99,9 +99,8 @@ class Recipe(BaseSlapRecipe):
...
@@ -99,9 +99,8 @@ class Recipe(BaseSlapRecipe):
crontabs
=
os
.
path
.
join
(
self
.
etc_directory
,
'crontabs'
)
crontabs
=
os
.
path
.
join
(
self
.
etc_directory
,
'crontabs'
)
self
.
_createDirectory
(
cron_d
)
self
.
_createDirectory
(
cron_d
)
self
.
_createDirectory
(
crontabs
)
self
.
_createDirectory
(
crontabs
)
# Use execute from erp5.
wrapper
=
zc
.
buildout
.
easy_install
.
scripts
([(
'crond'
,
wrapper
=
zc
.
buildout
.
easy_install
.
scripts
([(
'crond'
,
'slapos.recipe.
erp5
.execute'
,
'execute'
)],
self
.
ws
,
sys
.
executable
,
'slapos.recipe.
librecipe
.execute'
,
'execute'
)],
self
.
ws
,
sys
.
executable
,
self
.
wrapper_directory
,
arguments
=
[
self
.
wrapper_directory
,
arguments
=
[
self
.
options
[
'dcrond_binary'
].
strip
(),
'-s'
,
cron_d
,
'-c'
,
crontabs
,
self
.
options
[
'dcrond_binary'
].
strip
(),
'-s'
,
cron_d
,
'-c'
,
crontabs
,
'-t'
,
timestamps
,
'-f'
,
'-l'
,
'5'
,
'-M'
,
catcher
]
'-t'
,
timestamps
,
'-f'
,
'-l'
,
'5'
,
'-M'
,
catcher
]
...
@@ -225,7 +224,7 @@ class Recipe(BaseSlapRecipe):
...
@@ -225,7 +224,7 @@ class Recipe(BaseSlapRecipe):
self
.
substituteTemplate
(
template_filename
,
self
.
substituteTemplate
(
template_filename
,
stunnel_conf
))
stunnel_conf
))
wrapper
=
zc
.
buildout
.
easy_install
.
scripts
([(
'stunnel'
,
wrapper
=
zc
.
buildout
.
easy_install
.
scripts
([(
'stunnel'
,
'slapos.recipe.
erp5
.execute'
,
'execute'
)],
self
.
ws
,
sys
.
executable
,
'slapos.recipe.
librecipe
.execute'
,
'execute'
)],
self
.
ws
,
sys
.
executable
,
self
.
wrapper_directory
,
arguments
=
[
self
.
wrapper_directory
,
arguments
=
[
self
.
options
[
'stunnel_binary'
].
strip
(),
stunnel_conf_path
]
self
.
options
[
'stunnel_binary'
].
strip
(),
stunnel_conf_path
]
)[
0
]
)[
0
]
...
@@ -310,16 +309,14 @@ class Recipe(BaseSlapRecipe):
...
@@ -310,16 +309,14 @@ class Recipe(BaseSlapRecipe):
'--defaults-file=%s'
%
mysql_conf_path
,
'--defaults-file=%s'
%
mysql_conf_path
,
'--socket=%s'
%
mysql_conf
[
'socket'
].
strip
(),
'--user=root'
]
'--socket=%s'
%
mysql_conf
[
'socket'
].
strip
(),
'--user=root'
]
environment
=
dict
(
PATH
=
'%s'
%
self
.
bin_directory
)
environment
=
dict
(
PATH
=
'%s'
%
self
.
bin_directory
)
# Use execute from erp5.
innobackupex_incremental
=
zc
.
buildout
.
easy_install
.
scripts
([(
innobackupex_incremental
=
zc
.
buildout
.
easy_install
.
scripts
([(
'innobackupex_incremental'
,
'slapos.recipe.
erp5
.execute'
,
'executee'
)],
'innobackupex_incremental'
,
'slapos.recipe.
librecipe
.execute'
,
'executee'
)],
self
.
ws
,
sys
.
executable
,
self
.
bin_directory
,
arguments
=
[
self
.
ws
,
sys
.
executable
,
self
.
bin_directory
,
arguments
=
[
innobackupex_argument_list
+
[
'--incremental'
],
innobackupex_argument_list
+
[
'--incremental'
],
environment
])[
0
]
environment
])[
0
]
self
.
path_list
.
append
(
innobackupex_incremental
)
self
.
path_list
.
append
(
innobackupex_incremental
)
# Use execute from erp5.
innobackupex_full
=
zc
.
buildout
.
easy_install
.
scripts
([(
'innobackupex_full'
,
innobackupex_full
=
zc
.
buildout
.
easy_install
.
scripts
([(
'innobackupex_full'
,
'slapos.recipe.
erp5
.execute'
,
'executee'
)],
self
.
ws
,
'slapos.recipe.
librecipe
.execute'
,
'executee'
)],
self
.
ws
,
sys
.
executable
,
self
.
bin_directory
,
arguments
=
[
sys
.
executable
,
self
.
bin_directory
,
arguments
=
[
innobackupex_argument_list
,
innobackupex_argument_list
,
environment
])[
0
]
environment
])[
0
]
...
...
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