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
Gwenaël Samain
slapos
Commits
b41a45ac
Commit
b41a45ac
authored
Jan 21, 2014
by
Vincent Pelletier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5: Publish site-id, as it is auto-generated when not provided.
parent
4b11eb7d
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
2 deletions
+6
-2
software/erp5/instance-erp5-output-schema.json
software/erp5/instance-erp5-output-schema.json
+4
-0
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+1
-1
stack/erp5/instance-erp5.cfg.in
stack/erp5/instance-erp5.cfg.in
+1
-1
No files found.
software/erp5/instance-erp5-output-schema.json
View file @
b41a45ac
...
@@ -2,6 +2,10 @@
...
@@ -2,6 +2,10 @@
"$schema"
:
"http://json-schema.org/draft-04/schema#"
,
"$schema"
:
"http://json-schema.org/draft-04/schema#"
,
"description"
:
"Values returned by ERP5 instanciation"
,
"description"
:
"Values returned by ERP5 instanciation"
,
"properties"
:
{
"properties"
:
{
"site-id"
:
{
"description"
:
"Chosen ERP5Site object identifier"
,
"type"
:
"string"
},
"kumofs-url"
:
{
"kumofs-url"
:
{
"description"
:
"Persistent memcached access information"
,
"description"
:
"Persistent memcached access information"
,
"type"
:
"string"
"type"
:
"string"
...
...
stack/erp5/buildout.cfg
View file @
b41a45ac
...
@@ -272,7 +272,7 @@ extra-context =
...
@@ -272,7 +272,7 @@ extra-context =
[template-erp5]
[template-erp5]
< = download-base
< = download-base
filename = instance-erp5.cfg.in
filename = instance-erp5.cfg.in
md5sum =
fabf98dcb9e3d0fa8236397d69293528
md5sum =
0de8f9b4c873975a80bc3b0885c964ab
[template-neo]
[template-neo]
< = download-base
< = download-base
...
...
stack/erp5/instance-erp5.cfg.in
View file @
b41a45ac
{% if slap_software_type == software_type -%}
{% if slap_software_type == software_type -%}
{% set publish_dict = {} -%}
{% set frontend_dict = slapparameter_dict.get('frontend', {}) %}
{% set frontend_dict = slapparameter_dict.get('frontend', {}) %}
{% set has_frontend = frontend_dict.get('software-url', '') != '' -%}
{% set has_frontend = frontend_dict.get('software-url', '') != '' -%}
{% set site_id = slapparameter_dict.get('site-id', 'erp5') -%}
{% set site_id = slapparameter_dict.get('site-id', 'erp5') -%}
{% set publish_dict = {'site-id': site_id} -%}
[request-common]
[request-common]
recipe = slapos.cookbook:request.serialised
recipe = slapos.cookbook:request.serialised
software-url = ${slap-connection:software-release-url}
software-url = ${slap-connection:software-release-url}
...
...
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