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
Paul Graydon
slapos
Commits
4867d69c
Commit
4867d69c
authored
Feb 11, 2021
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Plain Diff
Update Release Candidate
parents
6c4d92e9
7bc19d84
Changes
10
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
1181 additions
and
1173 deletions
+1181
-1173
software/caddy-frontend/software.cfg
software/caddy-frontend/software.cfg
+0
-2
software/caucase/software.cfg
software/caucase/software.cfg
+0
-2
software/powerdns/buildout.hash.cfg
software/powerdns/buildout.hash.cfg
+1
-1
software/powerdns/instance-powerdns-replicate.cfg.jinja2
software/powerdns/instance-powerdns-replicate.cfg.jinja2
+1
-7
software/powerdns/test/test.py
software/powerdns/test/test.py
+19
-9
software/theia/buildout.hash.cfg
software/theia/buildout.hash.cfg
+1
-1
software/theia/download-plugins.cfg
software/theia/download-plugins.cfg
+63
-63
software/theia/generate_download_plugins_cfg.py
software/theia/generate_download_plugins_cfg.py
+5
-3
software/theia/yarn.lock
software/theia/yarn.lock
+1090
-1085
stack/caucase/buildout.cfg
stack/caucase/buildout.cfg
+1
-0
No files found.
software/caddy-frontend/software.cfg
View file @
4867d69c
...
...
@@ -16,8 +16,6 @@ extends =
../../component/nginx/buildout.cfg
../../stack/caucase/buildout.cfg
# Monitoring stack (keep on bottom)
../../stack/monitor/buildout.cfg
parts +=
caucase-eggs
...
...
software/caucase/software.cfg
View file @
4867d69c
...
...
@@ -2,8 +2,6 @@
extends =
buildout.hash.cfg
../../stack/caucase/buildout.cfg
# Monitoring stack (keep on bottom)
../../stack/monitor/buildout.cfg
parts +=
instance
...
...
software/powerdns/buildout.hash.cfg
View file @
4867d69c
...
...
@@ -26,7 +26,7 @@ md5sum = 20c37ea06a8fa405bc02470d5115fd11
[template-dns-replicate]
_update_hash_filename_ = instance-powerdns-replicate.cfg.jinja2
md5sum =
72ce30bee3b8a9da8ac9be7eb65d83a
2
md5sum =
504d15f0bbf0e515d5ff16070f1ac80
2
[iso-list]
_update_hash_filename_ = template/zz.countries.nexedi.dk.rbldnsd
...
...
software/powerdns/instance-powerdns-replicate.cfg.jinja2
View file @
4867d69c
...
...
@@ -122,22 +122,16 @@ config-monitor-username = admin
config-monitor-password = ${monitor-htpasswd:passwd}
[publish-information]
<= monitor-publish
recipe = slapos.cookbook:publish
slave-amount = {{ slave_instance_list | length }}
ns-record = {{ ns_record }}
monitor-url = ${monitor-publish-parameters:monitor-url}
monitor-user = ${monitor-publish-parameters:monitor-user}
monitor-password = ${monitor-publish-parameters:monitor-password}
{% for dns_name, dns_section in zip(dns_list, dns_section_list) -%}
{% set dns_ipv6 = '${' ~ dns_section ~ ':connection-powerdns-ipv6}' -%}
{% set dns_port = '${' ~ dns_section ~ ':connection-powerdns-port}' -%}
{{ dns_name }}-ipv6 = {{ dns_ipv6 }}
{{ dns_name }}-port = {{ dns_port }}
{% endfor -%}
{% set monitor_interface_url = slapparameter_dict.get('monitor-interface-url', 'https://monitor.app.officejs.com') -%}
{% if monitor_interface_url -%}
monitor-setup-url = {{ monitor_interface_url }}/#page=settings_configurator&url=${monitor-publish-parameters:monitor-url}
{% endif -%}
[buildout]
...
...
software/powerdns/test/test.py
View file @
4867d69c
...
...
@@ -32,6 +32,7 @@ import http.client
import
os
import
requests
import
unittest
import
urllib
from
slapos.recipe.librecipe
import
generateHashFromFiles
from
slapos.testing.testcase
import
makeModuleSetUpAndTestCaseClass
...
...
@@ -130,11 +131,19 @@ class TestMonitorAccess(PowerDNSTestCase):
def
test
(
self
):
connection_parameter_dict
=
self
.
requestDefaultInstance
()
\
.
getConnectionParameterDict
()
monitor_base_url
=
connection_parameter_dict
.
get
(
'monitor-url'
)
# special parsing of monitor-setup-url as the URLs there are not really
# still, this test does not really check the real monitor-setup-url
# but this seems good enough
monitor_setup_url
=
connection_parameter_dict
[
'monitor-setup-url'
]
monitor_base_url
=
connection_parameter_dict
[
'monitor-base-url'
]
monitor_url_with_auth
=
'https'
+
monitor_setup_url
.
split
(
'https'
)[
2
]
parsed_monitor_url
=
urllib
.
parse
.
urlparse
(
monitor_url_with_auth
)
auth
=
urllib
.
parse
.
parse_qs
(
parsed_monitor_url
.
path
)
result
=
requests
.
get
(
monitor_base_url
,
verify
=
False
,
auth
=
(
connection_parameter_dict
.
get
(
'monitor-user'
)
,
connection_parameter_dict
.
get
(
'monitor-password'
)
auth
[
'username'
][
0
]
,
auth
[
'password'
][
0
]
)
)
...
...
@@ -196,11 +205,11 @@ class PowerDNSSlaveTestCase(PowerDNSTestCase):
message
.
use_edns
(
options
=
[
client_subnet_option
])
answer
=
dns
.
query
.
udp
(
message
,
self
.
_ipv6_address
,
port
=
DNS_PORT
)
return
answer
.
get_rrset
(
dns
.
message
.
ANSWER
,
dns
.
name
.
from_text
(
domain_name
),
dns
.
rdataclass
.
IN
,
dns
.
rdatatype
.
CNAME
).
to_text
().
split
()[
-
1
]
dns
.
message
.
ANSWER
,
dns
.
name
.
from_text
(
domain_name
),
dns
.
rdataclass
.
IN
,
dns
.
rdatatype
.
CNAME
).
to_text
().
split
()[
-
1
]
def
_test_dns_resolver
(
self
):
slave_parameter_dict_dict
=
self
.
getSlaveParameterDictDict
()
...
...
@@ -242,7 +251,8 @@ class PowerDNSSlaveTestCase(PowerDNSTestCase):
self
.
assertEqual
(
slave_parameter_dict
.
get
(
region
,
'%s.%s.'
%
(
default_rr_dict
[
region
],
slave_parameter_dict
[
'origin'
])
'%s.%s.'
%
(
default_rr_dict
[
region
],
slave_parameter_dict
[
'origin'
])
),
self
.
dns_query
(
domain_name
,
subnet_dict
[
region
])
)
...
...
software/theia/buildout.hash.cfg
View file @
4867d69c
...
...
@@ -19,7 +19,7 @@ md5sum = a3e4cb7d28daa7816f04359c8aa3445b
[yarn.lock]
filename = yarn.lock
md5sum = e
4b8d436916e48d354342894d6ffecb7
md5sum = e
9c0f6cc380b53425f521a167c2fdf66
[python-language-server-requirements.txt]
filename = python-language-server-requirements.txt
...
...
software/theia/download-plugins.cfg
View file @
4867d69c
This diff is collapsed.
Click to expand it.
software/theia/generate_download_plugins_cfg.py
View file @
4867d69c
...
...
@@ -24,7 +24,9 @@ for plugin_and_version in '''\
vscode/handlebars/latest
vscode/hlsl/latest
vscode/html/latest
vscode/html-language-features/latest
# latest fails to activate:
# Activating extension 'HTML Language Features (built-in)' failed: The language client requires VS Code version ^1.52.0 but received version 1.50.0
vscode/html-language-features/1.52.1
vscode/ini/latest
vscode/jake/latest
vscode/java/latest
...
...
@@ -39,7 +41,7 @@ for plugin_and_version in '''\
vscode/make/latest
vscode/markdown/latest
# https://github.com/eclipse-theia/theia/issues/7780
vscode/markdown-language-features/1.39.
1
vscode/markdown-language-features/1.39.
2
vscode/merge-conflict/latest
vscode/npm/latest
ms-vscode/node-debug/latest
...
...
@@ -82,7 +84,7 @@ for plugin_and_version in '''\
vscjava/vscode-java-test/0.26.0
ms-python/python/2020.9.112786
perrinjerome/vscode-zc-buildout/latest
jebbs/plantuml/2.1
3.12
jebbs/plantuml/2.1
4.0
rafaelmaiolla/diff/latest
perrinjerome/git-commit-syntax/latest
perrinjerome/git-rebase-syntax/latest
...
...
software/theia/yarn.lock
View file @
4867d69c
This source diff could not be displayed because it is too large. You can
view the blob
instead.
stack/caucase/buildout.cfg
View file @
4867d69c
...
...
@@ -2,6 +2,7 @@
extends =
buildout.hash.cfg
../slapos.cfg
../monitor/buildout.cfg
../../component/python-cryptography/buildout.cfg
parts =
slapos-cookbook
...
...
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