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
Stephane VAROQUI
slapos
Commits
a03ffec7
Commit
a03ffec7
authored
Jun 07, 2013
by
Benjamin Blanc
Committed by
root
Jun 07, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add computer_id and server_url to erp5testnode.cfg
parent
afd836d9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
slapos/recipe/erp5testnode/__init__.py
slapos/recipe/erp5testnode/__init__.py
+4
-3
slapos/recipe/erp5testnode/template/erp5testnode.cfg.in
slapos/recipe/erp5testnode/template/erp5testnode.cfg.in
+2
-0
No files found.
slapos/recipe/erp5testnode/__init__.py
View file @
a03ffec7
...
@@ -54,8 +54,9 @@ class Recipe(GenericBaseRecipe):
...
@@ -54,8 +54,9 @@ class Recipe(GenericBaseRecipe):
if
software_path_list
:
if
software_path_list
:
CONFIG
[
"software_path_list"
]
=
"[software_list]"
CONFIG
[
"software_path_list"
]
=
"[software_list]"
CONFIG
[
"software_path_list"
]
+=
\
CONFIG
[
"software_path_list"
]
+=
\
"
\
n
path_list = %s"
%
","
.
join
(
software_path_list
)
"
\
n
path_list = %s"
%
","
.
join
(
software_path_list
)
CONFIG
[
'computer_id'
]
=
self
.
buildout
[
'slap-connection'
][
'computer-id'
]
CONFIG
[
'server_url'
]
=
self
.
buildout
[
'slap-connection'
][
'server-url'
]
configuration_file
=
self
.
createFile
(
configuration_file
=
self
.
createFile
(
self
.
options
[
'configuration-file'
],
self
.
options
[
'configuration-file'
],
self
.
substituteTemplate
(
self
.
substituteTemplate
(
...
@@ -107,4 +108,4 @@ class Recipe(GenericBaseRecipe):
...
@@ -107,4 +108,4 @@ class Recipe(GenericBaseRecipe):
# create empty html page to not allow listing of /
# create empty html page to not allow listing of /
page
=
open
(
os
.
path
.
join
(
self
.
options
[
'log-directory'
],
"index.html"
),
"w"
)
page
=
open
(
os
.
path
.
join
(
self
.
options
[
'log-directory'
],
"index.html"
),
"w"
)
page
.
write
(
"<html/>"
)
page
.
write
(
"<html/>"
)
page
.
close
()
page
.
close
()
\ No newline at end of file
slapos/recipe/erp5testnode/template/erp5testnode.cfg.in
View file @
a03ffec7
...
@@ -13,6 +13,8 @@ ipv6_address = %(ipv6_address)s
...
@@ -13,6 +13,8 @@ ipv6_address = %(ipv6_address)s
test_suite_master_url = %(test_suite_master_url)s
test_suite_master_url = %(test_suite_master_url)s
httpd_ip = %(httpd_ip)s
httpd_ip = %(httpd_ip)s
httpd_port = %(httpd_port)s
httpd_port = %(httpd_port)s
computer_id = %(computer_id)s
server_url = %(server_url)s
# Binaries
# Binaries
git_binary = %(git_binary)s
git_binary = %(git_binary)s
...
...
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