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
isaak yansane-sisk
slapos
Commits
03985382
Commit
03985382
authored
Jul 18, 2013
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cleanup software/cloudooo.
parent
f19c9165
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
25 deletions
+11
-25
software/cloudooo/instance-cloudoo.cfg.in
software/cloudooo/instance-cloudoo.cfg.in
+10
-24
software/cloudooo/software.cfg
software/cloudooo/software.cfg
+1
-1
No files found.
software/cloudooo/instance-cloudoo.cfg.in
View file @
03985382
...
@@ -36,9 +36,9 @@ ooo-uno-path = {{ parameter_dict['libreoffice-bin'] }}/basis-link/program
...
@@ -36,9 +36,9 @@ ooo-uno-path = {{ parameter_dict['libreoffice-bin'] }}/basis-link/program
< = cloudooo-base
< = cloudooo-base
port = {{ cloudooo_port }}
port = {{ cloudooo_port }}
openoffice-port = {{ cloudooo_port + 1 }}
openoffice-port = {{ cloudooo_port + 1 }}
configuration-file = ${
root
directory:etc}/{{ name }}.cfg
configuration-file = ${directory:etc}/{{ name }}.cfg
data-directory = ${
root
directory:srv}/{{ name }}
data-directory = ${directory:srv}/{{ name }}
wrapper = ${
base
directory:services}/{{ name }}
wrapper = ${directory:services}/{{ name }}
{% set cloudooo_port = cloudooo_port + 2 -%}
{% set cloudooo_port = cloudooo_port + 2 -%}
{% endfor -%}
{% endfor -%}
...
@@ -59,10 +59,6 @@ backend-list =
...
@@ -59,10 +59,6 @@ backend-list =
{{ "${" ~ section_name ~ ":ip}:${" ~ section_name ~ ":port}" }}
{{ "${" ~ section_name ~ ":ip}:${" ~ section_name ~ ":port}" }}
{%- endfor %}
{%- endfor %}
[cloudooo-instance]
# Paths: Data
data-directory = ${directory:cloudooo-data}
[cloudooo-test-runner]
[cloudooo-test-runner]
recipe = slapos.cookbook:cloudooo.test
recipe = slapos.cookbook:cloudooo.test
...
@@ -78,16 +74,16 @@ run-test-suite-binary = {{ bin_directory }}/runCloudoooTestSuite
...
@@ -78,16 +74,16 @@ run-test-suite-binary = {{ bin_directory }}/runCloudoooTestSuite
[fontconfig-instance]
[fontconfig-instance]
recipe = slapos.cookbook:fontconfig
recipe = slapos.cookbook:fontconfig
conf-path = ${
root
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 =
url-list =
service-folder = ${
base
directory:services}
service-folder = ${directory:services}
onetimedownload_path = {{ bin_directory }}/onetimedownload
onetimedownload_path = {{ bin_directory }}/onetimedownload
[binary-link]
[binary-link]
recipe = slapos.cookbook:symbolic.link
recipe = slapos.cookbook:symbolic.link
target-directory = ${
root
directory:bin}
target-directory = ${directory:bin}
link-binary =
link-binary =
{{ parameter_dict['coreutils'] }}/bin/basename
{{ parameter_dict['coreutils'] }}/bin/basename
{{ parameter_dict['coreutils'] }}/bin/cat
{{ parameter_dict['coreutils'] }}/bin/cat
...
@@ -103,22 +99,12 @@ link-binary =
...
@@ -103,22 +99,12 @@ link-binary =
{{ parameter_dict['poppler'] }}/bin/pdftohtml
{{ parameter_dict['poppler'] }}/bin/pdftohtml
# rest of parts are candidates for some generic stuff
# rest of parts are candidates for some generic stuff
[basedirectory]
recipe = slapos.cookbook:mkdirectory
services = ${rootdirectory:etc}/run
[directory]
[directory]
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
bin = ${rootdirectory:bin}
bin = ${buildout:directory}/bin
etc = ${rootdirectory:etc}
services = ${:etc}/run
var = ${rootdirectory:var}
run = ${:var}/run
font = ${rootdirectory:srv}/font
[rootdirectory]
recipe = slapos.cookbook:mkdirectory
etc = ${buildout:directory}/etc
etc = ${buildout:directory}/etc
font = ${:srv}/font
run = ${:var}/run
services = ${:etc}/run
srv = ${buildout:directory}/srv
srv = ${buildout:directory}/srv
bin = ${buildout:directory}/bin
var = ${buildout:directory}/var
var = ${buildout:directory}/var
software/cloudooo/software.cfg
View file @
03985382
...
@@ -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 =
6ac3dbd98958cdf3131c0e79754d4cb0
md5sum =
b3c0c25887b195471e582679c2421a08
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