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
Xavier Thompson
slapos
Commits
1992a46e
Commit
1992a46e
authored
May 17, 2019
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Plain Diff
Update release candidate
parents
af0fcc17
736be1f5
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
21 additions
and
7 deletions
+21
-7
component/geoip2/buildout.cfg
component/geoip2/buildout.cfg
+1
-1
software/caddy-frontend/buildout.hash.cfg
software/caddy-frontend/buildout.hash.cfg
+1
-1
software/caddy-frontend/common.cfg
software/caddy-frontend/common.cfg
+1
-1
software/caddy-frontend/templates/apache-custom-slave-list.cfg.in
.../caddy-frontend/templates/apache-custom-slave-list.cfg.in
+4
-2
software/caddy-frontend/test/test.py
software/caddy-frontend/test/test.py
+1
-0
software/neoppod/software-common.cfg
software/neoppod/software-common.cfg
+13
-2
No files found.
component/geoip2/buildout.cfg
View file @
1992a46e
...
@@ -17,5 +17,5 @@ rpath = ${:library-dirs}
...
@@ -17,5 +17,5 @@ rpath = ${:library-dirs}
[geolite2-country]
[geolite2-country]
recipe = slapos.recipe.build:download-unpacked
recipe = slapos.recipe.build:download-unpacked
url = http://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.tar.gz#${:md5sum}
url = http://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.tar.gz#${:md5sum}
md5sum =
81c75ee8c3baab3c99591c9a99f94530
md5sum =
579c2286209e9f9f6c8eb0035fa55974
strip-top-level-dir = true
strip-top-level-dir = true
software/caddy-frontend/buildout.hash.cfg
View file @
1992a46e
...
@@ -30,7 +30,7 @@ md5sum = d62aefe002ec13875924e4c219914795
...
@@ -30,7 +30,7 @@ md5sum = d62aefe002ec13875924e4c219914795
[template-slave-list]
[template-slave-list]
filename = templates/apache-custom-slave-list.cfg.in
filename = templates/apache-custom-slave-list.cfg.in
md5sum =
57f562311bac6dbf85cd35891eaa674
3
md5sum =
be47649fba6b44e136c3a8eb538443f
3
[template-slave-configuration]
[template-slave-configuration]
filename = templates/custom-virtualhost.conf.in
filename = templates/custom-virtualhost.conf.in
...
...
software/caddy-frontend/common.cfg
View file @
1992a46e
...
@@ -35,7 +35,7 @@ parts +=
...
@@ -35,7 +35,7 @@ parts +=
recipe = slapos.recipe.build:gitclone
recipe = slapos.recipe.build:gitclone
repository = https://lab.nexedi.com/nexedi/kedifa.git
repository = https://lab.nexedi.com/nexedi/kedifa.git
git-executable = ${git:location}/bin/git
git-executable = ${git:location}/bin/git
revision =
73a14b0e88afe7512f2fefe6ee9e0000fa523d5
d
revision =
acf0f0541ae95df9e2f2b126b3eb775f4b18678
d
[kedifa-develop]
[kedifa-develop]
recipe = zc.recipe.egg:develop
recipe = zc.recipe.egg:develop
...
...
software/caddy-frontend/templates/apache-custom-slave-list.cfg.in
View file @
1992a46e
...
@@ -32,6 +32,8 @@ create = true
...
@@ -32,6 +32,8 @@ create = true
{% if master_key_download_url %}
{% if master_key_download_url %}
{% do kedifa_updater_mapping.append((master_key_download_url, master_certificate, apache_certificate)) %}
{% do kedifa_updater_mapping.append((master_key_download_url, master_certificate, apache_certificate)) %}
{% else %}
{% do kedifa_updater_mapping.append(('https://notreadyyet', master_certificate, apache_certificate)) %}
{% endif %}
{% endif %}
{% if slave_kedifa_information %}
{% if slave_kedifa_information %}
...
@@ -55,7 +57,7 @@ output = {{ plugin_directory }}/${:name}
...
@@ -55,7 +57,7 @@ output = {{ plugin_directory }}/${:name}
{% if slave_kedifa %}
{% if slave_kedifa %}
{% set key_download_url = slave_kedifa.get('key-download-url') %}
{% set key_download_url = slave_kedifa.get('key-download-url') %}
{% else %}
{% else %}
{% set key_download_url = '' %}
{% set key_download_url = '
http://notreadyyet
' %}
{% endif %}
{% endif %}
{% set slave_type = slave_instance.get('type', '') %}
{% set slave_type = slave_instance.get('type', '') %}
{% set slave_section_title = 'dynamic-template-slave-instance-%s' % slave_reference %}
{% set slave_section_title = 'dynamic-template-slave-instance-%s' % slave_reference %}
...
@@ -446,7 +448,7 @@ hash-files = ${buildout:directory}/software_release/buildout.cfg
...
@@ -446,7 +448,7 @@ hash-files = ${buildout:directory}/software_release/buildout.cfg
recipe = plone.recipe.command
recipe = plone.recipe.command
# unfortunately slapos.cookbook:wrapper does not return generated wrapper path
# unfortunately slapos.cookbook:wrapper does not return generated wrapper path
# so it is needed to access it via service directory globbing
# so it is needed to access it via service directory globbing
command = {{ service_directory }}/kedifa-updater* --
once
command = {{ service_directory }}/kedifa-updater* --
prepare-only
update-command = ${:command}
update-command = ${:command}
[kedifa-updater-mapping]
[kedifa-updater-mapping]
...
...
software/caddy-frontend/test/test.py
View file @
1992a46e
...
@@ -5521,6 +5521,7 @@ class TestSlaveSlapOSMasterCertificateCompatibilityUpdate(
...
@@ -5521,6 +5521,7 @@ class TestSlaveSlapOSMasterCertificateCompatibilityUpdate(
})
})
self.runComputerPartition(max_quantity=1)
self.runComputerPartition(max_quantity=1)
self.runKedifaUpdater()
result = self.fakeHTTPSResult(
result = self.fakeHTTPSResult(
parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path')
parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path')
...
...
software/neoppod/software-common.cfg
View file @
1992a46e
...
@@ -45,8 +45,8 @@ eggs = neoppod[admin, ctl, master]
...
@@ -45,8 +45,8 @@ eggs = neoppod[admin, ctl, master]
${cython-zstd:egg}
${cython-zstd:egg}
${msgpack-python:egg}
${msgpack-python:egg}
${:adapter-egg}
${:adapter-egg}
${BTrees:egg}
psutil
psutil
BTrees
ZODB
ZODB
zope.testing
zope.testing
zodbtools
zodbtools
...
@@ -58,6 +58,17 @@ ZEO-patch-options = -p1
...
@@ -58,6 +58,17 @@ ZEO-patch-options = -p1
ZEO-patches =
ZEO-patches =
${:_profile_base_location_}/../../component/egg-patch/ZEO4/TCP_NODELAY.patch#b07288522d5c6857738240d948321df6
${:_profile_base_location_}/../../component/egg-patch/ZEO4/TCP_NODELAY.patch#b07288522d5c6857738240d948321df6
# XXX: buildout fails to install properly eggs with setup_requires
[BTrees]
recipe = zc.recipe.egg:custom
egg = ${:_buildout_section_name_}
setup-eggs = ${persistent:egg}
[persistent]
recipe = zc.recipe.egg:custom
egg = ${:_buildout_section_name_}
setup-eggs = ${python-cffi:egg}
###
[slapos-deps-eggs]
[slapos-deps-eggs]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
...
@@ -126,7 +137,7 @@ gitdb2 = 2.0.0
...
@@ -126,7 +137,7 @@ gitdb2 = 2.0.0
msgpack = 0.5.6
msgpack = 0.5.6
msgpack-python = 0.5.6
msgpack-python = 0.5.6
mysqlclient = 1.3.12
mysqlclient = 1.3.12
persistent = 4.
2.3
persistent = 4.
5.0
pycrypto = 2.6.1
pycrypto = 2.6.1
pycurl = 7.43.0
pycurl = 7.43.0
setproctitle = 1.1.10
setproctitle = 1.1.10
...
...
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