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
Lorenzo Martinico
slapos
Commits
9eb45d11
Commit
9eb45d11
authored
Jun 21, 2011
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use librecipe.execute to provide perl binary.
Without this, system perl will be used.
parent
de4f5964
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
33 additions
and
9 deletions
+33
-9
slapos/recipe/erp5/__init__.py
slapos/recipe/erp5/__init__.py
+24
-0
software/sanef/instance.cfg
software/sanef/instance.cfg
+8
-8
software/sanef/software.cfg
software/sanef/software.cfg
+1
-1
No files found.
slapos/recipe/erp5/__init__.py
View file @
9eb45d11
...
@@ -930,5 +930,29 @@ class Recipe(BaseSlapRecipe):
...
@@ -930,5 +930,29 @@ class Recipe(BaseSlapRecipe):
mysql_backup_cron
=
os
.
path
.
join
(
self
.
cron_d
,
'mysql_backup'
)
mysql_backup_cron
=
os
.
path
.
join
(
self
.
cron_d
,
'mysql_backup'
)
open
(
mysql_backup_cron
,
'w'
).
write
(
'0 0 * * * '
+
backup_controller
)
open
(
mysql_backup_cron
,
'w'
).
write
(
'0 0 * * * '
+
backup_controller
)
self
.
path_list
.
append
(
mysql_backup_cron
)
self
.
path_list
.
append
(
mysql_backup_cron
)
# maatkit installation
for
mk_script_name
in
(
'mk-variable-advisor'
,
'mk-table-usage-binary'
,
'mk-visual-explain'
,
'mk-config-diff'
,
'mk-deadlock-logger'
,
'mk-error-log'
,
'mk-index-usage'
,
'mk-query-advisor'
,
):
mk_argument_list
=
[
self
.
options
[
'perl_binary'
],
self
.
options
[
'%s_binary'
%
mk_script_name
],
'--defaults-file=%s'
%
mysql_conf_path
,
'--socket=%s'
%
mysql_conf
[
'socket'
].
strip
(),
'--user=root'
,
]
environment
=
dict
(
PATH
=
'%s'
%
self
.
bin_directory
)
mk_exe
=
zc
.
buildout
.
easy_install
.
scripts
([(
mk_script_name
,
'slapos.recipe.librecipe.execute'
,
'executee'
)],
self
.
ws
,
sys
.
executable
,
self
.
bin_directory
,
arguments
=
[
mk_argument_list
,
environment
])[
0
]
self
.
path_list
.
append
(
mk_exe
)
# The return could be more explicit database, user ...
# The return could be more explicit database, user ...
return
mysql_conf
return
mysql_conf
software/sanef/instance.cfg
View file @
9eb45d11
...
@@ -32,6 +32,14 @@ tidstorage_repozo_binary = ${buildout:bin-directory}/tidstorage_repozo
...
@@ -32,6 +32,14 @@ tidstorage_repozo_binary = ${buildout:bin-directory}/tidstorage_repozo
tidstoraged_binary = ${buildout:bin-directory}/tidstoraged
tidstoraged_binary = ${buildout:bin-directory}/tidstoraged
xtrabackup_binary = ${xtrabackup:location}/bin/xtrabackup_51
xtrabackup_binary = ${xtrabackup:location}/bin/xtrabackup_51
zabbix_agent_binary = ${zabbix-agent:location}/sbin/zabbix_agent
zabbix_agent_binary = ${zabbix-agent:location}/sbin/zabbix_agent
mk-variable-advisor-binary = ${perl:siteprefix}/bin/mk-variable-advisor
mk-table-usage-binary = ${perl:siteprefix}/bin/mk-table-usage
mk-visual-explain-binary = ${perl:siteprefix}/bin/mk-visual-explain
mk-config-diff-binary = ${perl:siteprefix}/bin/mk-config-diff
mk-deadlock-logger-binary = ${perl:siteprefix}/bin/mk-deadlock-logger
mk-error-log-binary = ${perl:siteprefix}/bin/mk-error-log
mk-index-usage-binary = ${perl:siteprefix}/bin/mk-index-usage
mk-query-advisor-binary = ${perl:siteprefix}/bin/mk-query-advisor
# cloudooo specific configuration
# cloudooo specific configuration
ooo_binary_path = ${libreoffice-bin:location}/program
ooo_binary_path = ${libreoffice-bin:location}/program
...
@@ -59,14 +67,6 @@ link_binary_list =
...
@@ -59,14 +67,6 @@ link_binary_list =
${poppler:location}/bin/pdfinfo
${poppler:location}/bin/pdfinfo
${poppler:location}/bin/pdftotext
${poppler:location}/bin/pdftotext
${poppler:location}/bin/pdftohtml
${poppler:location}/bin/pdftohtml
${maatkit:location}/bin/mk-variable-advisor
${maatkit:location}/bin/mk-table-usage
${maatkit:location}/bin/mk-visual-explain
${maatkit:location}/bin/mk-config-diff
${maatkit:location}/bin/mk-deadlock-logger
${maatkit:location}/bin/mk-error-log
${maatkit:location}/bin/mk-index-usage
${maatkit:location}/bin/mk-query-advisor
bt5_repo_list =
bt5_repo_list =
${erp5:location}/product/ERP5/bootstrap bt5bootstrap
${erp5:location}/product/ERP5/bootstrap bt5bootstrap
...
...
software/sanef/software.cfg
View file @
9eb45d11
...
@@ -40,7 +40,7 @@ extra-paths +=
...
@@ -40,7 +40,7 @@ extra-paths +=
[template]
[template]
url = ${:_profile_base_location_}/instance.cfg
url = ${:_profile_base_location_}/instance.cfg
md5sum =
dc7b3515924a4d18bfb9094fa9538f56
md5sum =
4d06f3e4b80e8e9bd0d18a3fba3100a3
[eggcheck]
[eggcheck]
recipe = plone.recipe.command
recipe = plone.recipe.command
...
...
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