Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos-caddy
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
Guillaume Hervier
slapos-caddy
Commits
971d0bb7
Commit
971d0bb7
authored
Jun 22, 2015
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5: Make possible extent the list of initial business templates to install.
parent
4f5490c5
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
16 deletions
+13
-16
software/wendelin/software.cfg
software/wendelin/software.cfg
+2
-1
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+5
-3
stack/erp5/instance-erp5-cluster.cfg.in
stack/erp5/instance-erp5-cluster.cfg.in
+1
-6
stack/erp5/instance-erp5-single.cfg.in
stack/erp5/instance-erp5-single.cfg.in
+1
-6
stack/erp5/instance.cfg.in
stack/erp5/instance.cfg.in
+4
-0
No files found.
software/wendelin/software.cfg
View file @
971d0bb7
...
...
@@ -43,6 +43,7 @@ repository_id_list += wendelin
[local-bt5-repository]
# we need to override it
list = ${erp5:location}/bt5 ${erp5:location}/product/ERP5/bootstrap ${wendelin:location}/bt5/
bt5_list = erp5_full_text_myisam_catalog erp5_configurator_standard erp5_configurator_maxma_demo erp5_configurator_ung erp5_configurator_run_my_doc erp5_configurator_ebusiness_lotse erp5_wendelin_configurator
[wendelin]
<= erp5
...
...
@@ -57,4 +58,4 @@ msgpack-python = 0.4.6
numpy = 1.9.2
wendelin.core = 0.3
ipython = 3.1.0
matplotlib = 1.4.3
\ No newline at end of file
matplotlib = 1.4.3
stack/erp5/buildout.cfg
View file @
971d0bb7
...
...
@@ -199,7 +199,7 @@ mode = 640
# XXX: "template.cfg" is hardcoded in instanciation recipe
filename = template.cfg
template = ${:_profile_base_location_}/instance.cfg.in
md5sum =
0d777bfc8377e5b8ddc2e32a10f45b9b
md5sum =
38d87bbb2b8193eb588b05ae6b8bbb3d
extra-context =
key apache_location apache:location
key aspell_location aspell:location
...
...
@@ -242,6 +242,7 @@ extra-context =
key librsvg_location librsvg:location
key libxcb_location libxcb:location
key local_bt5_repository local-bt5-repository:list
key bt5_list local-bt5-repository:bt5_list
key logrotate_location logrotate:location
key mariadb_location mariadb:location
key mariadb_resiliency_after_import_script mariadb-resiliency-after-import-script:target
...
...
@@ -285,13 +286,13 @@ extra-context =
[template-erp5-single]
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-erp5-single.cfg.in
md5sum =
ee5ce422b52d1325f301a684ffc0eea3
md5sum =
6dd76b8543347a11ebddcdc16dd98dd9
mode = 640
[template-erp5-cluster]
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-erp5-cluster.cfg.in
md5sum =
2ff90bb68761b4930f92321f3b6ba590
md5sum =
5080559723859b40a390d700431ffedd
mode = 640
[template-varnish]
...
...
@@ -312,6 +313,7 @@ list = ${local-bt5-repository:list}
# Same as bt5-repository, but only local repository.
# Used to generate bt5lists.
list = ${erp5:location}/bt5 ${erp5:location}/product/ERP5/bootstrap
bt5_list = erp5_full_text_myisam_catalog erp5_configurator_standard erp5_configurator_maxma_demo erp5_configurator_ung erp5_configurator_run_my_doc erp5_configurator_ebusiness_lotse
[genbt5list]
recipe = plone.recipe.command
...
...
stack/erp5/instance-erp5-cluster.cfg.in
View file @
971d0bb7
...
...
@@ -84,12 +84,7 @@ kumofs-computer-guid = ${slap-connection:computer-id}
tidstorage-computer-guid = ${slap-connection:computer-id}
varnish-computer-guid = ${slap-connection:computer-id}
cloudooo-json =
bt5 = erp5_full_text_myisam_catalog
erp5_configurator_standard
erp5_configurator_maxma_demo
erp5_configurator_ung
erp5_configurator_run_my_doc
erp5_configurator_ebusiness_lotse
bt5 = {{ bt5_list }}
bt5-repository-url = {{ local_bt5_repository }}
smtp-url = smtp://localhost:25/
...
...
stack/erp5/instance-erp5-single.cfg.in
View file @
971d0bb7
...
...
@@ -27,12 +27,7 @@ versions = versions
site-id = erp5
cloudooo-json =
promise-path = ${rootdirectory:etc}/erp5promise.cfg
bt5 = erp5_full_text_myisam_catalog
erp5_configurator_standard
erp5_configurator_maxma_demo
erp5_configurator_ung
erp5_configurator_run_my_doc
erp5_configurator_ebusiness_lotse
bt5 = {{ bt5_list }}
bt5-repository-url = {{ local_bt5_repository }}
smtp-url = smtp://localhost:25/
...
...
stack/erp5/instance.cfg.in
View file @
971d0bb7
...
...
@@ -208,6 +208,7 @@ extra-context =
bin-directory = {{ bin_directory }}
openssl = {{ openssl_location }}
local_bt5_repository = {{ local_bt5_repository }}
bt5_list = {{ bt5_list }}
dash = {{ dash_location }}
curl = {{ curl_location }}
...
...
@@ -225,9 +226,11 @@ extra-context =
key dash_location template-erp5-single-parameters:dash
key template_zope dynamic-template-zope:rendered
key local_bt5_repository template-erp5-single-parameters:local_bt5_repository
key bt5_list template-erp5-single-parameters:bt5_list
[dynamic-template-cluster-parameters]
local-bt5-repository = {{ local_bt5_repository }}
bt5_list = {{ bt5_list }}
[dynamic-template-cluster]
< = jinja2-template-base
...
...
@@ -235,6 +238,7 @@ template = {{ template_erp5_cluster }}
filename = instance-erp5-cluster.cfg
extra-context =
key local_bt5_repository dynamic-template-cluster-parameters:local-bt5-repository
key bt5_list template-erp5-single-parameters:bt5_list
# Must match the key id in [switch-softwaretype] which uses this section.
# XXX: it is dangerous to use buildout-style expansion in jinja context declaration
raw software_type ${:software-type}
...
...
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