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
Lu Xu
slapos
Commits
0188e5c1
Commit
0188e5c1
authored
Feb 21, 2022
by
Thomas Leymonerie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
software/theia: Add ipv6 in connection_parameter
parent
e2c46cfe
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
4 deletions
+9
-4
software/theia/buildout.hash.cfg
software/theia/buildout.hash.cfg
+2
-2
software/theia/instance-output-schema.json
software/theia/instance-output-schema.json
+4
-0
software/theia/instance-resilient.cfg.jinja
software/theia/instance-resilient.cfg.jinja
+2
-1
software/theia/instance-theia.cfg.jinja.in
software/theia/instance-theia.cfg.jinja.in
+1
-1
No files found.
software/theia/buildout.hash.cfg
View file @
0188e5c1
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
[instance-theia]
[instance-theia]
_update_hash_filename_ = instance-theia.cfg.jinja.in
_update_hash_filename_ = instance-theia.cfg.jinja.in
md5sum =
4df9f0d76a134a8abec9060a0c1be50b
md5sum =
6e8f39dc0c720bb7273bb8b8a4726634
[instance]
[instance]
_update_hash_filename_ = instance.cfg.in
_update_hash_filename_ = instance.cfg.in
...
@@ -31,7 +31,7 @@ md5sum = b3f1dd83033d6a45def0bd26e70d5a9c
...
@@ -31,7 +31,7 @@ md5sum = b3f1dd83033d6a45def0bd26e70d5a9c
[instance-resilient]
[instance-resilient]
_update_hash_filename_ = instance-resilient.cfg.jinja
_update_hash_filename_ = instance-resilient.cfg.jinja
md5sum =
b1e338973bc9cfe1bb4e16d46b3c6da9
md5sum =
ad9499e7355ded4975ad313442cecb7a
[theia-common]
[theia-common]
_update_hash_filename_ = theia_common.py
_update_hash_filename_ = theia_common.py
...
...
software/theia/instance-output-schema.json
View file @
0188e5c1
...
@@ -17,6 +17,10 @@
...
@@ -17,6 +17,10 @@
"backend-url"
:
{
"backend-url"
:
{
"description"
:
"Theia Backend URL"
,
"description"
:
"Theia Backend URL"
,
"type"
:
"string"
"type"
:
"string"
},
"ipv6"
:
{
"description"
:
"A Theia ipv6 address"
,
"type"
:
"string"
}
}
},
},
"type"
:
"object"
"type"
:
"object"
...
...
software/theia/instance-resilient.cfg.jinja
View file @
0188e5c1
...
@@ -33,7 +33,7 @@ parts +=
...
@@ -33,7 +33,7 @@ parts +=
# Ask for the connection parameters of the main theia
# Ask for the connection parameters of the main theia
[request-theia]
[request-theia]
return += url username password backend-url
return += url username password backend-url
ipv6
# Publish connection parameters of the main theia and resiliency parameters
# Publish connection parameters of the main theia and resiliency parameters
...
@@ -43,6 +43,7 @@ url = ${request-theia:connection-url}
...
@@ -43,6 +43,7 @@ url = ${request-theia:connection-url}
username = ${request-theia:connection-username}
username = ${request-theia:connection-username}
password = ${request-theia:connection-password}
password = ${request-theia:connection-password}
backend-url = ${request-theia:connection-backend-url}
backend-url = ${request-theia:connection-backend-url}
ipv6 = ${request-theia:connection-ipv6}
monitor-base-url = ${monitor-publish:monitor-base-url}
monitor-base-url = ${monitor-publish:monitor-base-url}
monitor-setup-url = ${monitor-publish:monitor-setup-url}
monitor-setup-url = ${monitor-publish:monitor-setup-url}
<= publish-connection-information
<= publish-connection-information
software/theia/instance-theia.cfg.jinja.in
View file @
0188e5c1
...
@@ -37,7 +37,7 @@ additional-url = $${remote-additional-frontend:connection-secure_access}
...
@@ -37,7 +37,7 @@ additional-url = $${remote-additional-frontend:connection-secure_access}
username = $${frontend-instance-password:username}
username = $${frontend-instance-password:username}
password = $${frontend-instance-password:passwd}
password = $${frontend-instance-password:passwd}
backend-url = $${frontend-instance:url}
backend-url = $${frontend-instance:url}
ipv6 = {{ ipv6_random }}
[directory]
[directory]
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
...
...
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