Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
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
Laurent S
erp5
Commits
2b4d5933
Commit
2b4d5933
authored
May 06, 2011
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow to pass custom template_filename location.
parent
740b93e0
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py
slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py
+4
-2
No files found.
slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py
View file @
2b4d5933
...
@@ -740,7 +740,9 @@ SSLRandomSeed connect builtin
...
@@ -740,7 +740,9 @@ SSLRandomSeed connect builtin
return
'https://[%(ip)s]:%(port)s'
%
apache_conf
return
'https://[%(ip)s]:%(port)s'
%
apache_conf
def
installMysqlServer
(
self
,
ip
,
port
,
database
=
'erp5'
,
user
=
'user'
,
def
installMysqlServer
(
self
,
ip
,
port
,
database
=
'erp5'
,
user
=
'user'
,
test_database
=
'test_erp5'
,
test_user
=
'test_user'
):
test_database
=
'test_erp5'
,
test_user
=
'test_user'
,
template_filename
=
None
):
if
template_filename
is
None
:
template_filename
=
self
.
getTemplateFilename
(
'my.cnf.in'
)
error_log
=
os
.
path
.
join
(
self
.
log_directory
,
'mysqld.log'
)
error_log
=
os
.
path
.
join
(
self
.
log_directory
,
'mysqld.log'
)
slow_query_log
=
os
.
path
.
join
(
self
.
log_directory
,
'mysql-slow.log'
)
slow_query_log
=
os
.
path
.
join
(
self
.
log_directory
,
'mysql-slow.log'
)
mysql_conf
=
dict
(
mysql_conf
=
dict
(
...
@@ -770,7 +772,7 @@ SSLRandomSeed connect builtin
...
@@ -770,7 +772,7 @@ SSLRandomSeed connect builtin
self
.
_createDirectory
(
mysql_conf
[
'data_directory'
])
self
.
_createDirectory
(
mysql_conf
[
'data_directory'
])
mysql_conf_path
=
self
.
createConfigurationFile
(
"my.cnf"
,
mysql_conf_path
=
self
.
createConfigurationFile
(
"my.cnf"
,
self
.
substituteTemplate
(
self
.
getTemplateFilename
(
'my.cnf.in'
)
,
self
.
substituteTemplate
(
template_filename
,
mysql_conf
))
mysql_conf
))
mysql_script_list
=
[]
mysql_script_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