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
Carlos Ramos Carreño
slapos
Commits
98b029f0
Commit
98b029f0
authored
Jun 03, 2020
by
Gabriel Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cloudoooo: support python 3
parent
034b1fc9
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
software/cloudooo/buildout.hash.cfg
software/cloudooo/buildout.hash.cfg
+1
-1
software/cloudooo/instance-cloudooo.cfg.in
software/cloudooo/instance-cloudooo.cfg.in
+5
-5
No files found.
software/cloudooo/buildout.hash.cfg
View file @
98b029f0
...
@@ -18,4 +18,4 @@ md5sum = 6e4431cf4b0a0d034402604b1e2844c0
...
@@ -18,4 +18,4 @@ md5sum = 6e4431cf4b0a0d034402604b1e2844c0
[template-cloudooo-instance]
[template-cloudooo-instance]
filename = instance-cloudooo.cfg.in
filename = instance-cloudooo.cfg.in
md5sum =
e01ee969a45d44d386653a9eb699cc59
md5sum =
f65fef3a7c0ece347a6bd4dec24bce4b
software/cloudooo/instance-cloudooo.cfg.in
View file @
98b029f0
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
{% set next_port = slapparameter_dict.get(instance_parameter_dict['port-parameter-name'], next_port) | int -%}
{% set next_port = slapparameter_dict.get(instance_parameter_dict['port-parameter-name'], next_port) | int -%}
{% endif -%}
{% endif -%}
{% do assert(next_port > 0) -%}
{% do assert(next_port > 0) -%}
{% set next_port = itertools.count(next_port)
.next
-%}
{% set next_port = itertools.count(next_port) -%}
{% set backend_count = instance_parameter_dict['backend-count'] | int -%}
{% set backend_count = instance_parameter_dict['backend-count'] | int -%}
{% if instance_parameter_dict.get('backend-count-parameter-name') -%}
{% if instance_parameter_dict.get('backend-count-parameter-name') -%}
...
@@ -34,8 +34,8 @@
...
@@ -34,8 +34,8 @@
{% set mimetype_entry_addition = mimetype_entry_addition ~ "\n" ~ slapparameter_dict.get(instance_parameter_dict['mimetype-entry-addition-parameter-name'], '') -%}
{% set mimetype_entry_addition = mimetype_entry_addition ~ "\n" ~ slapparameter_dict.get(instance_parameter_dict['mimetype-entry-addition-parameter-name'], '') -%}
{% endif -%}
{% endif -%}
{% set apache_port = next
_port(
) -%}
{% set apache_port = next
(next_port
) -%}
{% set haproxy_port = next
_port(
) -%}
{% set haproxy_port = next
(next_port
) -%}
{% set apache_ip_list = [ipv4] -%}
{% set apache_ip_list = [ipv4] -%}
{% if ipv6_set -%}
{% if ipv6_set -%}
...
@@ -207,8 +207,8 @@ ooo-uno-path = {{ parameter_dict['libreoffice-bin'] }}/basis-link/program
...
@@ -207,8 +207,8 @@ ooo-uno-path = {{ parameter_dict['libreoffice-bin'] }}/basis-link/program
{% set name = 'cloudooo-' ~ index -%}
{% set name = 'cloudooo-' ~ index -%}
[{{ cloudooo(name) }}]
[{{ cloudooo(name) }}]
< = cloudooo-base
< = cloudooo-base
port = {{ next
_port(
) }}
port = {{ next
(next_port
) }}
openoffice-port = {{ next
_port(
) }}
openoffice-port = {{ next
(next_port
) }}
configuration-file = ${directory:etc}/{{ name }}.cfg
configuration-file = ${directory:etc}/{{ name }}.cfg
data-directory = ${directory:srv}/{{ name }}
data-directory = ${directory:srv}/{{ name }}
wrapper = ${directory:services}/{{ name }}
wrapper = ${directory:services}/{{ name }}
...
...
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