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
Aurel
slapos
Commits
4b89f8c8
Commit
4b89f8c8
authored
12 years ago
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace erp5.update per erp5.promise and erp5.bootstrap
parent
51090e66
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
18 deletions
+30
-18
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+3
-2
stack/erp5/instance-erp5-development.cfg.in
stack/erp5/instance-erp5-development.cfg.in
+25
-16
stack/erp5/instance.cfg.in
stack/erp5/instance.cfg.in
+2
-0
No files found.
stack/erp5/buildout.cfg
View file @
4b89f8c8
...
@@ -211,7 +211,7 @@ extra-context =
...
@@ -211,7 +211,7 @@ extra-context =
[template-zope]
[template-zope]
recipe = slapos.recipe.build:download
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-zope.cfg.in
url = ${:_profile_base_location_}/instance-zope.cfg.in
md5sum =
ea09a89ca79290c33de0b59a19a5490f
md5sum =
bb06b0a957ba8011f5b0f1cb09ac03de
mode = 640
mode = 640
[template-kumofs]
[template-kumofs]
...
@@ -283,6 +283,7 @@ extra-context =
...
@@ -283,6 +283,7 @@ extra-context =
key libreoffice_bin_location libreoffice-bin:location
key libreoffice_bin_location libreoffice-bin:location
key librsvg_location librsvg:location
key librsvg_location librsvg:location
key libxcb_location libxcb:location
key libxcb_location libxcb:location
key local_bt5_repository local-bt5-repository:list
key logrotate_location logrotate:location
key logrotate_location logrotate:location
key mariadb_location mariadb:location
key mariadb_location mariadb:location
key openssl_location openssl:location
key openssl_location openssl:location
...
@@ -317,7 +318,7 @@ extra-context =
...
@@ -317,7 +318,7 @@ extra-context =
[template-erp5-development]
[template-erp5-development]
recipe = slapos.recipe.build:download
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-erp5-development.cfg.in
url = ${:_profile_base_location_}/instance-erp5-development.cfg.in
md5sum =
df405a60901b5c112093d276c5bb1998
md5sum =
e95429fa0e4e3bb87b042277ba52fd8f
mode = 640
mode = 640
[template-erp5-production]
[template-erp5-production]
...
...
This diff is collapsed.
Click to expand it.
stack/erp5/instance-erp5-development.cfg.in
View file @
4b89f8c8
...
@@ -12,8 +12,9 @@ parts +=
...
@@ -12,8 +12,9 @@ parts +=
request-memcached
request-memcached
request-kumofs
request-kumofs
basedirectory
basedirectory
erp5-update
test-runner
test-runner
erp5-bootstrap
erp5-promise
eggs-directory = {{ eggs_directory }}
eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }}
...
@@ -23,6 +24,14 @@ offline = true
...
@@ -23,6 +24,14 @@ offline = true
# default site id
# default site id
site-id = erp5
site-id = erp5
cloudooo-json =
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
bt5-repository-url = {{ local_bt5_repository }}
smtp-url = smtp://localhost:25/
[test-runner]
[test-runner]
recipe = slapos.cookbook:erp5.test
recipe = slapos.cookbook:erp5.test
...
@@ -60,25 +69,21 @@ certs = ${directory:test-ca-dir}/certs
...
@@ -60,25 +69,21 @@ certs = ${directory:test-ca-dir}/certs
newcerts = ${directory:test-ca-dir}/newcerts
newcerts = ${directory:test-ca-dir}/newcerts
crl = ${directory:test-ca-dir}/crl
crl = ${directory:test-ca-dir}/crl
[erp5-update]
[erp5-bootstrap]
recipe = slapos.cookbook:erp5.update
recipe = slapos.cookbook:erp5.bootstrap
runner-path = ${basedirectory:services}/erp5-bootstrap
# Configuration
url = http://${zope-instance:user}:${zope-instance:password}@${zope-instance:ip}:${zope-instance:port}/
mysql-url = ${request-mariadb:connection-url}
mysql-url = ${request-mariadb:connection-url}
zope-url = http://${zope-instance:user}:${zope-instance:password}@${zope-instance:ip}:${zope-instance:port}/${slap-parameter:site-id}
[erp5-promise]
recipe = slapos.cookbook:erp5.promise
promise-path = ${slap-parameter:promise-path}
kumofs-url = ${request-kumofs:connection-url}
kumofs-url = ${request-kumofs:connection-url}
memcached-url = ${request-memcached:connection-url}
memcached-url = ${request-memcached:connection-url}
cloudooo-url = ${request-cloudooo:connection-url}
cloudooo-url = ${request-cloudooo:connection-url}
site-id = ${slap-parameter:site-id}
smtp-url = ${slap-parameter:smtp-url}
openssl-binary = {{ openssl_location }}/bin/openssl
bt5 = ${slap-parameter:bt5}
cadir-path = ${erp5-certificate-authority:ca-dir}
bt5-repository-url = ${slap-parameter:bt5-repository-url}
# Paths
update-wrapper = ${basedirectory:services}/erp5-update
# Defaults
configurator-bt5-list = erp5_full_text_myisam_catalog erp5_configurator_standard erp5_configurator_maxma_demo erp5_configurator_ung erp5_configurator_ung erp5_configurator_run_my_doc
bt5-repository-list = ${zope-instance:bt5-repository-list}
[request-common]
[request-common]
recipe = slapos.cookbook:request
recipe = slapos.cookbook:request
...
@@ -114,6 +119,10 @@ software-type = memcached
...
@@ -114,6 +119,10 @@ software-type = memcached
name = KumoFS
name = KumoFS
software-type = kumofs
software-type = kumofs
[zope-instance]
promise-path = ${slap-parameter:promise-path}
site-id = ${slap-parameter:site-id}
[directory]
[directory]
test-ca-dir = ${rootdirectory:srv}/test-ca
test-ca-dir = ${rootdirectory:srv}/test-ca
test-instance-path = ${rootdirectory:srv}/test-instance
test-instance-path = ${rootdirectory:srv}/test-instance
...
...
This diff is collapsed.
Click to expand it.
stack/erp5/instance.cfg.in
View file @
4b89f8c8
...
@@ -168,6 +168,7 @@ extra-context =
...
@@ -168,6 +168,7 @@ extra-context =
[template-erp5-development-parameters]
[template-erp5-development-parameters]
bin-directory = {{ bin_directory }}
bin-directory = {{ bin_directory }}
openssl = {{ openssl_location }}
openssl = {{ openssl_location }}
local_bt5_repository = {{ local_bt5_repository }}
[template-erp5-development]
[template-erp5-development]
< = jinja2-template-base
< = jinja2-template-base
...
@@ -180,6 +181,7 @@ extra-context =
...
@@ -180,6 +181,7 @@ extra-context =
key bin_directory template-erp5-development-parameters:bin-directory
key bin_directory template-erp5-development-parameters:bin-directory
key openssl_location template-erp5-development-parameters:openssl
key openssl_location template-erp5-development-parameters:openssl
key template_zope dynamic-template-zope:rendered
key template_zope dynamic-template-zope:rendered
key local_bt5_repository template-erp5-development-parameters:local_bt5_repository
[switch-softwaretype]
[switch-softwaretype]
recipe = slapos.cookbook:softwaretype
recipe = slapos.cookbook:softwaretype
...
...
This diff is collapsed.
Click to expand it.
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