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
Boxiang Sun
slapos
Commits
d66e512b
Commit
d66e512b
authored
Jul 18, 2013
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make tcpv4-port and font-url-list configurable and add json schemas.
parent
03985382
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
43 additions
and
4 deletions
+43
-4
software/cloudooo/instance-cloudoo-input-schema.json
software/cloudooo/instance-cloudoo-input-schema.json
+27
-0
software/cloudooo/instance-cloudoo-output-schema.json
software/cloudooo/instance-cloudoo-output-schema.json
+11
-0
software/cloudooo/instance-cloudoo.cfg.in
software/cloudooo/instance-cloudoo.cfg.in
+4
-3
software/cloudooo/software.cfg
software/cloudooo/software.cfg
+1
-1
No files found.
software/cloudooo/instance-cloudoo-input-schema.json
0 → 100644
View file @
d66e512b
{
"$schema"
:
"http://json-schema.org/draft-04/schema#"
,
"extends"
:
"./schema-definitions.json#"
,
"properties"
:
{
"tcpv4-port"
:
{
"allOf"
:
[{
"$ref"
:
"#/definitions/tcpv4port"
},
{
"description"
:
"Start allocating ports at this value, going upward"
,
"default"
:
23000
}]
},
"font-url-list"
:
{
"description"
:
"List of URLs from which fonts are to be downloaded"
,
"default"
:
[],
"items"
:
{
"type"
:
"string"
},
"type"
:
"array"
}
"backend-count"
:
{
"description"
:
"Number of backend cloudooo instances"
,
"default"
:
1
,
"type"
:
"integer"
}
}
}
software/cloudooo/instance-cloudoo-output-schema.json
0 → 100644
View file @
d66e512b
{
"$schema"
:
"http://json-schema.org/draft-04/schema#"
,
"description"
:
"Values returned by Cloudooo instanciation"
,
"properties"
:
{
"url"
:
{
"description"
:
"Conversion service access information"
,
"type"
:
"string"
}
},
"type"
:
"object"
}
software/cloudooo/instance-cloudoo.cfg.in
View file @
d66e512b
...
@@ -12,7 +12,7 @@ develop-eggs-directory = {{ develop_eggs_directory }}
...
@@ -12,7 +12,7 @@ develop-eggs-directory = {{ develop_eggs_directory }}
offline = true
offline = true
[publish-cloudooo-connection-information]
[publish-cloudooo-connection-information]
recipe = slapos.cookbook:publish
url
recipe = slapos.cookbook:publish
.serialised
url = cloudooo://${haproxy:ip}:${haproxy:port}/
url = cloudooo://${haproxy:ip}:${haproxy:port}/
[cloudooo-base]
[cloudooo-base]
...
@@ -28,7 +28,7 @@ ooo-binary-path = {{ parameter_dict['libreoffice-bin'] }}/program
...
@@ -28,7 +28,7 @@ ooo-binary-path = {{ parameter_dict['libreoffice-bin'] }}/program
ooo-paster = {{ bin_directory }}/cloudooo_paster
ooo-paster = {{ bin_directory }}/cloudooo_paster
ooo-uno-path = {{ parameter_dict['libreoffice-bin'] }}/basis-link/program
ooo-uno-path = {{ parameter_dict['libreoffice-bin'] }}/basis-link/program
{% set cloudooo_port =
23000
-%}
{% set cloudooo_port =
slapparameter_dict.get('tcpv4_port', 23000) | int
-%}
{% set backend_count = slapparameter_dict.get('backend-count', 1) | int -%}
{% set backend_count = slapparameter_dict.get('backend-count', 1) | int -%}
{% for index in range(backend_count) -%}
{% for index in range(backend_count) -%}
{% set name = 'cloudooo-' ~ index -%}
{% set name = 'cloudooo-' ~ index -%}
...
@@ -77,7 +77,8 @@ recipe = slapos.cookbook:fontconfig
...
@@ -77,7 +77,8 @@ recipe = slapos.cookbook:fontconfig
conf-path = ${directory: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 =
{# XXX: violates "instanciation happens offline" rule -#}
url-list = {{ slapparameter_dict.get('font-url-list', []) | join(' ') }}
service-folder = ${directory:services}
service-folder = ${directory:services}
onetimedownload_path = {{ bin_directory }}/onetimedownload
onetimedownload_path = {{ bin_directory }}/onetimedownload
...
...
software/cloudooo/software.cfg
View file @
d66e512b
...
@@ -92,7 +92,7 @@ extra-context =
...
@@ -92,7 +92,7 @@ extra-context =
[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 = b
3c0c25887b195471e582679c2421a08
md5sum = b
be84b4c9022db62c926e8a8a4bf02a1
mode = 640
mode = 640
[networkcache]
[networkcache]
...
...
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