Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
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
5
Merge Requests
5
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
slapos
Commits
4bacee5c
Commit
4bacee5c
authored
May 13, 2023
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
software/cloudooo: use python3
parent
268b00d6
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
9 deletions
+6
-9
software/cloudooo/buildout.hash.cfg
software/cloudooo/buildout.hash.cfg
+1
-1
software/cloudooo/instance-cloudooo.cfg.in
software/cloudooo/instance-cloudooo.cfg.in
+3
-3
software/cloudooo/software-common.cfg
software/cloudooo/software-common.cfg
+1
-1
software/cloudooo/software.cfg
software/cloudooo/software.cfg
+0
-3
stack/cloudooo.cfg
stack/cloudooo.cfg
+1
-1
No files found.
software/cloudooo/buildout.hash.cfg
View file @
4bacee5c
...
...
@@ -18,7 +18,7 @@ md5sum = d1e4d7306c39f2ebc64d0407860d4301
[template-cloudooo-instance]
filename = instance-cloudooo.cfg.in
md5sum =
5b83fa6e0a20f0a31605e372e366c8ea
md5sum =
13759bf9720f0e7109fc35a8ad8a50a9
[template-haproxy-cfg]
filename = haproxy.cfg.in
...
...
software/cloudooo/instance-cloudooo.cfg.in
View file @
4bacee5c
...
...
@@ -10,7 +10,7 @@
{% set next_port = slapparameter_dict.get(instance_parameter_dict['port-parameter-name'], next_port) | int -%}
{% endif -%}
{% do assert(next_port > 0) -%}
{% set next_port = itertools.count(next_port).
next
-%}
{% set next_port = itertools.count(next_port).
__next__
-%}
{% set backend_count = instance_parameter_dict['backend-count'] | int -%}
{% if instance_parameter_dict.get('backend-count-parameter-name') -%}
...
...
@@ -85,7 +85,7 @@ output = ${directory:apache-conf}/apache.conf
context = section parameter_dict apache-conf-parameter-dict
[apache-conf-parameter-dict]
backend-list = {{ dumps(
apache_dict.values(
)) }}
backend-list = {{ dumps(
list(apache_dict.values()
)) }}
ip-list = {{ dumps(apache_ip_list) }}
pid-file = ${directory:run}/apache.pid
error-log = ${directory:log}/apache-error.log
...
...
@@ -103,7 +103,7 @@ ssl-session-cache = ${directory:log}/apache-ssl-session-cache
<= monitor-promise-base
promise = check_url_available
name = apache.py
config-url = https://{{ ipv4 }}:{{
apache_dict.values(
)[0][0] }}
config-url = https://{{ ipv4 }}:{{
list(apache_dict.values()
)[0][0] }}
# XXX cloudooo replies "400 Bad Request" for GET on / but what we want to check
# is that we don't have a "503 Service Unavailable" from apache or haproxy.
config-http-code = 400
...
...
software/cloudooo/software-common.cfg
View file @
4bacee5c
...
...
@@ -107,4 +107,4 @@ url = ${:_profile_base_location_}/${:filename}
[versions]
argparse = 1.4.0
py
Pdf = 1.13
py
pdf = 3.6.0:whl
software/cloudooo/software.cfg
View file @
4bacee5c
...
...
@@ -6,9 +6,6 @@ parts =
${cloudooo-buildout:parts}
template-cloudooo
[python]
part = python2.7
[cloudooo-software-parameter-dict]
publish-url-name = cloudooo
port-parameter-name = tcpv4-port
...
...
stack/cloudooo.cfg
View file @
4bacee5c
...
...
@@ -75,5 +75,5 @@ Paste = 3.4.0
PasteScript = 3.2.0:whl
WSGIUtils = 0.7.2
WSGIserver = 1.3
python-magic = 0.4.
18
python-magic = 0.4.
27
PasteDeploy = 2.1.0
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