Commit a59551e8 authored by Rafael Monnerat's avatar Rafael Monnerat 👻

Added promise for cloudooo and openoffice at erp5 software release

Only check if cloudooo and openoffice port is listenning.
parent baa82aa0
...@@ -235,7 +235,7 @@ mode = 640 ...@@ -235,7 +235,7 @@ mode = 640
[template-cloudooo] [template-cloudooo]
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-cloudoo.cfg.in url = ${:_profile_base_location_}/instance-cloudoo.cfg.in
md5sum = d3b3afac9099823ba2853070324a29c8 md5sum = 53492e520be57f4c6a9eacd107c8d446
mode = 640 mode = 640
[template-zope-conf] [template-zope-conf]
......
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
parts = parts =
publish-cloudooo-connection-information publish-cloudooo-connection-information
cloudooo-instance cloudooo-instance
promise
promise-openoffice
eggs-directory = {{ eggs_directory }} eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }} develop-eggs-directory = {{ develop_eggs_directory }}
offline = true offline = true
...@@ -22,8 +24,8 @@ port = 23000 ...@@ -22,8 +24,8 @@ port = 23000
openoffice-port = 23060 openoffice-port = 23060
# Paths # Paths
configuration-file = ${rootdirectory:etc}/cloudooo.cfg configuration-file = ${directory:etc}/cloudooo.cfg
wrapper = ${basedirectory:services}/cloudooo wrapper = ${directory:service}/cloudooo
# Paths: Data # Paths: Data
data-directory = ${directory:cloudooo-data} data-directory = ${directory:cloudooo-data}
...@@ -40,25 +42,32 @@ ooo-uno-path = {{ parameter_dict['libreoffice-bin'] }}/basis-link/program ...@@ -40,25 +42,32 @@ ooo-uno-path = {{ parameter_dict['libreoffice-bin'] }}/basis-link/program
[fontconfig-instance] [fontconfig-instance]
recipe = slapos.cookbook:fontconfig recipe = slapos.cookbook:fontconfig
conf-path = ${rootdirectory:etc}/font.conf conf-path = ${directory:etc}/font.conf
font-system-folder = {{ parameter_dict['fonts'] }} font-system-folder = {{ parameter_dict['fonts'] }}
font-folder = ${directory:font} font-folder = ${directory:font}
url-list = {{ json.get('font_url_list', []) | join(' ') }} url-list = {{ json.get('font_url_list', []) | join(' ') }}
service-folder = ${basedirectory:services} service-folder = ${directory:service}
onetimedownload_path = {{ bin_directory }}/onetimedownload onetimedownload_path = {{ bin_directory }}/onetimedownload
# rest of parts are candidates for some generic stuff [promise]
[basedirectory] recipe = slapos.cookbook:check_port_listening
recipe = slapos.cookbook:mkdirectory path = ${directory:promise}/cloudooo
services = ${rootdirectory:etc}/run hostname = ${cloudooo-instance:ip}
port = ${cloudooo-instance:port}
[directory] [promise-openoffice]
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:check_port_listening
cloudooo-data = ${rootdirectory:srv}/cloudooo path = ${directory:promise}/openoffice
font = ${rootdirectory:srv}/font hostname = ${cloudooo-instance:ip}
port = ${cloudooo-instance:openoffice-port}
[rootdirectory] # rest of parts are candidates for some generic stuff
[directory]
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
etc = ${buildout:directory}/etc etc = ${buildout:directory}/etc
srv = ${buildout:directory}/srv srv = ${buildout:directory}/srv
service = ${:etc}/run
promise = ${:etc}/promise
cloudooo-data = ${:srv}/cloudooo
font = ${:srv}/font
{% endif %} {% endif %}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment