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
Xavier Thompson
slapos
Commits
3fb799fd
Commit
3fb799fd
authored
Jun 27, 2011
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into slapos
parents
cb83ddbc
bb12f835
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
20 additions
and
21 deletions
+20
-21
CHANGES.txt
CHANGES.txt
+5
-3
setup.py
setup.py
+1
-1
slapos/recipe/mysql/__init__.py
slapos/recipe/mysql/__init__.py
+4
-7
software/kumofs/software.cfg
software/kumofs/software.cfg
+2
-2
software/mariadb/software.cfg
software/mariadb/software.cfg
+3
-3
software/memcached/software.cfg
software/memcached/software.cfg
+2
-2
software/mysql-5.1/software.cfg
software/mysql-5.1/software.cfg
+3
-3
No files found.
CHANGES.txt
View file @
3fb799fd
0.9 (
unreleased
)
0.9 (
2011-06-24
)
================
================
* No changes yet.
* mysql recipe : Changing slapos.recipe.erp5.execute to
slapos.recipe.librecipe.execute [Cedric de Saint Martin]
0.8 (2011-06-15)
0.8 (2011-06-15)
================
================
* Add MySQL and MariaDB standalone software release and recipe [Cedric de Saint Martin]
* Add MySQL and MariaDB standalone software release and recipe
[Cedric de Saint Martin]
* Fixed slapos.recipe.erp5testnode instantiation [Sebastien Robin]
* Fixed slapos.recipe.erp5testnode instantiation [Sebastien Robin]
0.7 (2011-06-14)
0.7 (2011-06-14)
...
...
setup.py
View file @
3fb799fd
...
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
...
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
import
glob
import
glob
import
os
import
os
version
=
'0.9
-dev
'
version
=
'0.9'
name
=
'slapos.cookbook'
name
=
'slapos.cookbook'
long_description
=
open
(
"README.txt"
).
read
()
+
"
\
n
"
+
\
long_description
=
open
(
"README.txt"
).
read
()
+
"
\
n
"
+
\
open
(
"CHANGES.txt"
).
read
()
+
"
\
n
"
open
(
"CHANGES.txt"
).
read
()
+
"
\
n
"
...
...
slapos/recipe/mysql/__init__.py
View file @
3fb799fd
...
@@ -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
]
...
...
software/kumofs/software.cfg
View file @
3fb799fd
...
@@ -72,13 +72,13 @@ output = ${buildout:directory}/template.cfg
...
@@ -72,13 +72,13 @@ output = ${buildout:directory}/template.cfg
mode = 0644
mode = 0644
[versions]
[versions]
slapos.cookbook = 0.
4
slapos.cookbook = 0.
7
erp5.recipe.cmmiforcei686 = 0.1.1
erp5.recipe.cmmiforcei686 = 0.1.1
hexagonit.recipe.cmmi = 1.5.0
hexagonit.recipe.cmmi = 1.5.0
hexagonit.recipe.download = 1.5.0
hexagonit.recipe.download = 1.5.0
# Required by slapos.cookbook==0.
4
# Required by slapos.cookbook==0.
7
slapos.core = 0.2
slapos.core = 0.2
collective.recipe.template = 1.8
collective.recipe.template = 1.8
netaddr = 0.7.5
netaddr = 0.7.5
...
...
software/mariadb/software.cfg
View file @
3fb799fd
...
@@ -74,10 +74,10 @@ output = ${buildout:directory}/template.cfg
...
@@ -74,10 +74,10 @@ output = ${buildout:directory}/template.cfg
mode = 0644
mode = 0644
[versions]
[versions]
slapos.cookbook = 0.
8
slapos.cookbook = 0.
9
# Required by slapos.cookbook==0.
7
# Required by slapos.cookbook==0.
9
slapos.core = 0.
3
slapos.core = 0.
4
collective.recipe.template = 1.8
collective.recipe.template = 1.8
netaddr = 0.7.5
netaddr = 0.7.5
xml-marshaller = 0.9.7
xml-marshaller = 0.9.7
...
...
software/memcached/software.cfg
View file @
3fb799fd
...
@@ -71,9 +71,9 @@ output = ${buildout:directory}/template.cfg
...
@@ -71,9 +71,9 @@ output = ${buildout:directory}/template.cfg
mode = 0644
mode = 0644
[versions]
[versions]
slapos.cookbook = 0.
4
slapos.cookbook = 0.
7
# Required by slapos.cookbook==0.
4
# Required by slapos.cookbook==0.
7
slapos.core = 0.2
slapos.core = 0.2
collective.recipe.template = 1.8
collective.recipe.template = 1.8
netaddr = 0.7.5
netaddr = 0.7.5
...
...
software/mysql-5.1/software.cfg
View file @
3fb799fd
...
@@ -75,10 +75,10 @@ output = ${buildout:directory}/template.cfg
...
@@ -75,10 +75,10 @@ output = ${buildout:directory}/template.cfg
mode = 0644
mode = 0644
[versions]
[versions]
slapos.cookbook = 0.
8
slapos.cookbook = 0.
9
# Required by slapos.cookbook==0.
7
# Required by slapos.cookbook==0.
9
slapos.core = 0.
3
slapos.core = 0.
4
collective.recipe.template = 1.8
collective.recipe.template = 1.8
netaddr = 0.7.5
netaddr = 0.7.5
xml-marshaller = 0.9.7
xml-marshaller = 0.9.7
...
...
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