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
Labels
Merge Requests
105
Merge Requests
105
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
ed4be2ae
Commit
ed4be2ae
authored
Feb 09, 2022
by
Arnaud Fontaine
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/zope4py2' into zope4py3
parents
d3134754
02434a7c
Changes
24
Show whitespace changes
Inline
Side-by-side
Showing
24 changed files
with
125 additions
and
151 deletions
+125
-151
component/caddy/buildout.cfg
component/caddy/buildout.cfg
+1
-1
component/dcron/buildout.cfg
component/dcron/buildout.cfg
+0
-2
component/randomsleep/buildout.cfg
component/randomsleep/buildout.cfg
+4
-4
software/caddy-frontend/buildout.hash.cfg
software/caddy-frontend/buildout.hash.cfg
+1
-1
software/caddy-frontend/templates/trafficserver/records.config.jinja2
...dy-frontend/templates/trafficserver/records.config.jinja2
+2
-0
software/caddy-frontend/test/test.py
software/caddy-frontend/test/test.py
+28
-102
software/ors-amarisoft/buildout.hash.cfg
software/ors-amarisoft/buildout.hash.cfg
+5
-5
software/ors-amarisoft/instance-enb-epc.jinja2.cfg
software/ors-amarisoft/instance-enb-epc.jinja2.cfg
+12
-0
software/ors-amarisoft/instance-enb.jinja2.cfg
software/ors-amarisoft/instance-enb.jinja2.cfg
+12
-0
software/ors-amarisoft/instance-epc.jinja2.cfg
software/ors-amarisoft/instance-epc.jinja2.cfg
+12
-0
software/ors-amarisoft/instance-gnb-epc.jinja2.cfg
software/ors-amarisoft/instance-gnb-epc.jinja2.cfg
+12
-0
software/ors-amarisoft/instance-gnb.jinja2.cfg
software/ors-amarisoft/instance-gnb.jinja2.cfg
+12
-0
software/repman/buildout.hash.cfg
software/repman/buildout.hash.cfg
+2
-2
software/repman/instance-mariadb.cfg.jinja2.in
software/repman/instance-mariadb.cfg.jinja2.in
+3
-9
software/repman/instance.cfg.in
software/repman/instance.cfg.in
+0
-1
stack/erp5/buildout.hash.cfg
stack/erp5/buildout.hash.cfg
+5
-5
stack/erp5/haproxy.cfg.in
stack/erp5/haproxy.cfg.in
+1
-1
stack/erp5/instance-balancer.cfg.in
stack/erp5/instance-balancer.cfg.in
+1
-1
stack/erp5/instance-mariadb.cfg.in
stack/erp5/instance-mariadb.cfg.in
+3
-9
stack/erp5/instance.cfg.in
stack/erp5/instance.cfg.in
+0
-1
stack/erp5/zope.conf.in
stack/erp5/zope.conf.in
+3
-3
stack/monitor/buildout.cfg
stack/monitor/buildout.cfg
+2
-0
stack/monitor/buildout.hash.cfg
stack/monitor/buildout.hash.cfg
+1
-1
stack/monitor/instance-monitor.cfg.jinja2.in
stack/monitor/instance-monitor.cfg.jinja2.in
+3
-3
No files found.
component/caddy/buildout.cfg
View file @
ed4be2ae
...
...
@@ -10,7 +10,7 @@ parts =
<= go-git-package
go.importpath = github.com/caddyserver/caddy
repository = https://lab.nexedi.com/nexedi/caddy.git
revision = nxd-v1.0.3-1-
g2c11cedc
revision = nxd-v1.0.3-1-
03fba31bf
[gowork]
golang = ${golang1.17:location}
...
...
component/dcron/buildout.cfg
View file @
ed4be2ae
...
...
@@ -2,7 +2,6 @@
extends =
../coreutils/buildout.cfg
../patch/buildout.cfg
../randomsleep/buildout.cfg
parts = dcron-output
...
...
@@ -20,7 +19,6 @@ make-options =
PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
post-install =
chmod u-s %(location)s/bin/crontab
dummy = ${randomsleep:recipe}
[dcron-output]
# Shared binary location to ease migration
...
...
component/randomsleep/buildout.cfg
View file @
ed4be2ae
...
...
@@ -4,10 +4,10 @@ extends =
../bash/buildout.cfg
[randomsleep]
recipe = slapos.recipe.template
:jinja2
rendered
= ${buildout:bin-directory}/${:_buildout_section_name_}
templat
e =
inline:
#!${bash:location}/bin/bash
recipe = slapos.recipe.template
output
= ${buildout:bin-directory}/${:_buildout_section_name_}
inlin
e =
#!${bash:location}/bin/bash
[ $# = 1 ] || {
echo "usage: ${:_buildout_section_name_} maxseconds"
exit 1
...
...
software/caddy-frontend/buildout.hash.cfg
View file @
ed4be2ae
...
...
@@ -62,7 +62,7 @@ md5sum = 975177dedf677d24e14cede5d13187ce
[template-trafficserver-records-config]
_update_hash_filename_ = templates/trafficserver/records.config.jinja2
md5sum =
88a2db868720009f6092843784b06611
md5sum =
e87238c53d080ef9ef90040e57bc1395
[template-trafficserver-storage-config]
_update_hash_filename_ = templates/trafficserver/storage.config.jinja2
...
...
software/caddy-frontend/templates/trafficserver/records.config.jinja2
View file @
ed4be2ae
...
...
@@ -16,6 +16,8 @@ CONFIG proxy.config.output.logfile STRING traffic.out
CONFIG proxy.config.admin.user_id STRING {{ '#%s' % os_module.geteuid() }}
LOCAL proxy.local.incoming_ip_to_bind STRING {{ ats_configuration['local-ip'] }}
CONFIG proxy.config.log.logfile_dir STRING {{ ats_directory['log'] }}
# Never change Server header
CONFIG proxy.config.http.response_server_enabled INT 0
# Implement RFC 5861 with core
CONFIG proxy.config.http.cache.open_write_fail_action INT 2
CONFIG proxy.config.body_factory.template_sets_dir STRING {{ ats_configuration['templates-dir'] }}
...
...
software/caddy-frontend/test/test.py
View file @
ed4be2ae
...
...
@@ -485,6 +485,9 @@ def fakeHTTPResult(domain, path, port=HTTP_PORT,
class
TestHandler
(
BaseHTTPRequestHandler
):
identification
=
None
configuration
=
{}
# override Server header response
server_version
=
"TestBackend"
sys_version
=
""
def
log_message
(
self
,
*
args
):
if
os
.
environ
.
get
(
'SLAPOS_TEST_DEBUG'
):
...
...
@@ -843,6 +846,19 @@ class HttpFrontendTestCase(SlapOSInstanceTestCase):
except
Exception
as
e
:
self
.
fail
(
e
)
def
assertResponseHeaders
(
self
,
result
):
headers
=
result
.
headers
.
copy
()
self
.
assertKeyWithPop
(
'Date'
,
headers
)
# drop vary-keys
headers
.
pop
(
'Connection'
,
None
)
headers
.
pop
(
'Content-Length'
,
None
)
headers
.
pop
(
'Keep-Alive'
,
None
)
headers
.
pop
(
'Transfer-Encoding'
,
None
)
self
.
assertEqual
(
'TestBackend'
,
headers
.
pop
(
'Server'
,
''
))
return
headers
def
assertLogAccessUrlWithPop
(
self
,
parameter_dict
):
log_access_url
=
parameter_dict
.
pop
(
'log-access-url'
)
...
...
@@ -3612,18 +3628,9 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
self
.
assertEqualResultJson
(
result
,
'Path'
,
'/test-path/deeper'
)
headers
=
result
.
headers
.
copy
()
self
.
assertKeyWithPop
(
'Server'
,
headers
)
self
.
assertKeyWithPop
(
'Date'
,
headers
)
headers
=
self
.
assertResponseHeaders
(
result
)
self
.
assertKeyWithPop
(
'Age'
,
headers
)
# drop keys appearing randomly in headers
headers
.
pop
(
'Transfer-Encoding'
,
None
)
headers
.
pop
(
'Content-Length'
,
None
)
headers
.
pop
(
'Connection'
,
None
)
headers
.
pop
(
'Keep-Alive'
,
None
)
self
.
assertEqual
(
{
'Content-type'
:
'application/json'
,
...
...
@@ -3654,18 +3661,9 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
self
.
assertEqualResultJson
(
result
,
'Path'
,
'/test-path/deeper'
)
headers
=
result
.
headers
.
copy
(
)
headers
=
self
.
assertResponseHeaders
(
result
)
self
.
assertKeyWithPop
(
'Server'
,
headers
)
self
.
assertKeyWithPop
(
'Date'
,
headers
)
self
.
assertKeyWithPop
(
'Age'
,
headers
)
# drop keys appearing randomly in headers
headers
.
pop
(
'Transfer-Encoding'
,
None
)
headers
.
pop
(
'Content-Length'
,
None
)
headers
.
pop
(
'Connection'
,
None
)
headers
.
pop
(
'Keep-Alive'
,
None
)
self
.
assertEqual
(
{
'Content-type'
:
'application/json'
,
...
...
@@ -3712,18 +3710,8 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
self
.
assertEqualResultJson
(
result
,
'Path'
,
'/test-path/deeper'
)
headers
=
result
.
headers
.
copy
()
self
.
assertKeyWithPop
(
'Server'
,
headers
)
self
.
assertKeyWithPop
(
'Date'
,
headers
)
headers
=
self
.
assertResponseHeaders
(
result
)
self
.
assertKeyWithPop
(
'Age'
,
headers
)
# drop keys appearing randomly in headers
headers
.
pop
(
'Transfer-Encoding'
,
None
)
headers
.
pop
(
'Content-Length'
,
None
)
headers
.
pop
(
'Connection'
,
None
)
headers
.
pop
(
'Keep-Alive'
,
None
)
self
.
assertEqual
(
{
'Content-type'
:
'application/json'
,
...
...
@@ -3743,7 +3731,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
self
.
assertEqual
(
httplib
.
OK
,
result
.
status_code
)
self
.
assertEqualResultJson
(
result
,
'Path'
,
'/HTTPS/test'
)
headers
=
result
.
headers
.
copy
(
)
self
.
assertResponseHeaders
(
result
)
result
=
fakeHTTPSResult
(
parameter_dict
[
'domain'
],
...
...
@@ -3753,8 +3741,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
self
.
assertEqual
(
httplib
.
OK
,
result
.
status_code
)
self
.
assertEqualResultJson
(
result
,
'Path'
,
'/HTTP/test'
)
headers
=
result
.
headers
.
copy
()
self
.
assertResponseHeaders
(
result
)
def
test_enable_cache
(
self
):
parameter_dict
=
self
.
assertSlaveBase
(
'enable_cache'
)
...
...
@@ -3771,18 +3758,10 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
self
.
assertEqualResultJson
(
result
,
'Path'
,
'/test-path/deeper'
)
headers
=
result
.
headers
.
copy
(
)
headers
=
self
.
assertResponseHeaders
(
result
)
self
.
assertKeyWithPop
(
'Server'
,
headers
)
self
.
assertKeyWithPop
(
'Date'
,
headers
)
self
.
assertKeyWithPop
(
'Age'
,
headers
)
# drop keys appearing randomly in headers
headers
.
pop
(
'Transfer-Encoding'
,
None
)
headers
.
pop
(
'Content-Length'
,
None
)
headers
.
pop
(
'Connection'
,
None
)
headers
.
pop
(
'Keep-Alive'
,
None
)
self
.
assertEqual
(
{
'Content-type'
:
'application/json'
,
...
...
@@ -3973,18 +3952,10 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
self
.
assertEqualResultJson
(
result
,
'Path'
,
'/test-path/deeper'
)
headers
=
result
.
headers
.
copy
(
)
headers
=
self
.
assertResponseHeaders
(
result
)
self
.
assertKeyWithPop
(
'Server'
,
headers
)
self
.
assertKeyWithPop
(
'Date'
,
headers
)
self
.
assertKeyWithPop
(
'Age'
,
headers
)
# drop keys appearing randomly in headers
headers
.
pop
(
'Transfer-Encoding'
,
None
)
headers
.
pop
(
'Content-Length'
,
None
)
headers
.
pop
(
'Connection'
,
None
)
headers
.
pop
(
'Keep-Alive'
,
None
)
self
.
assertEqual
(
{
'Content-type'
:
'application/json'
,
...
...
@@ -4118,18 +4089,10 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
self
.
assertEqualResultJson
(
result
,
'Path'
,
'/test-path'
)
headers
=
result
.
headers
.
copy
(
)
headers
=
self
.
assertResponseHeaders
(
result
)
self
.
assertKeyWithPop
(
'Server'
,
headers
)
self
.
assertKeyWithPop
(
'Date'
,
headers
)
self
.
assertKeyWithPop
(
'Age'
,
headers
)
# drop keys appearing randomly in headers
headers
.
pop
(
'Transfer-Encoding'
,
None
)
headers
.
pop
(
'Content-Length'
,
None
)
headers
.
pop
(
'Connection'
,
None
)
headers
.
pop
(
'Keep-Alive'
,
None
)
self
.
assertEqual
(
{
'Content-type'
:
'application/json'
,
...
...
@@ -4165,18 +4128,10 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
self
.
assertEqualResultJson
(
result
,
'Path'
,
'/test-path'
)
headers
=
result
.
headers
.
copy
(
)
headers
=
self
.
assertResponseHeaders
(
result
)
self
.
assertKeyWithPop
(
'Server'
,
headers
)
self
.
assertKeyWithPop
(
'Date'
,
headers
)
self
.
assertKeyWithPop
(
'Age'
,
headers
)
# drop keys appearing randomly in headers
headers
.
pop
(
'Transfer-Encoding'
,
None
)
headers
.
pop
(
'Content-Length'
,
None
)
headers
.
pop
(
'Connection'
,
None
)
headers
.
pop
(
'Keep-Alive'
,
None
)
self
.
assertEqual
(
{
'Content-type'
:
'application/json'
,
...
...
@@ -4206,16 +4161,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
self
.
assertEqualResultJson
(
result
,
'Path'
,
'/test-path'
)
headers
=
result
.
headers
.
copy
()
self
.
assertKeyWithPop
(
'Server'
,
headers
)
self
.
assertKeyWithPop
(
'Date'
,
headers
)
# drop vary-keys
headers
.
pop
(
'Content-Length'
,
None
)
headers
.
pop
(
'Transfer-Encoding'
,
None
)
headers
.
pop
(
'Connection'
,
None
)
headers
.
pop
(
'Keep-Alive'
,
None
)
headers
=
self
.
assertResponseHeaders
(
result
)
self
.
assertEqual
(
{
...
...
@@ -4240,17 +4186,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
self
.
assertEqualResultJson
(
result
,
'Path'
,
'/test-path'
)
headers
=
result
.
headers
.
copy
()
self
.
assertKeyWithPop
(
'Server'
,
headers
)
self
.
assertKeyWithPop
(
'Date'
,
headers
)
# drop vary-keys
headers
.
pop
(
'Content-Length'
,
None
)
headers
.
pop
(
'Transfer-Encoding'
,
None
)
headers
.
pop
(
'Connection'
,
None
)
headers
.
pop
(
'Keep-Alive'
,
None
)
headers
=
self
.
assertResponseHeaders
(
result
)
self
.
assertEqual
(
{
'Content-type'
:
'application/json'
,
...
...
@@ -5017,17 +4953,7 @@ class TestSlaveGlobalDisableHttp2(TestSlave):
self
.
assertEqualResultJson
(
result
,
'Path'
,
'/test-path'
)
headers
=
result
.
headers
.
copy
()
self
.
assertKeyWithPop
(
'Server'
,
headers
)
self
.
assertKeyWithPop
(
'Date'
,
headers
)
# drop vary-keys
headers
.
pop
(
'Content-Length'
,
None
)
headers
.
pop
(
'Transfer-Encoding'
,
None
)
headers
.
pop
(
'Connection'
,
None
)
headers
.
pop
(
'Keep-Alive'
,
None
)
headers
=
self
.
assertResponseHeaders
(
result
)
self
.
assertEqual
(
{
'Content-type'
:
'application/json'
,
...
...
software/ors-amarisoft/buildout.hash.cfg
View file @
ed4be2ae
...
...
@@ -20,23 +20,23 @@ md5sum = 6ea4fa210a91c15278c847a809de5991
[template-lte-enb-epc]
_update_hash_filename_ = instance-enb-epc.jinja2.cfg
md5sum =
cf6c400d9fa5b0942f9be7145f77b8de
md5sum =
1358f8e0a4cecefe4cdf389b69067f34
[template-lte-enb]
_update_hash_filename_ = instance-enb.jinja2.cfg
md5sum =
fe249168a3f50b0efe6aeae39afb03ae
md5sum =
e4c224da723ad56091f27ed5c0b0bbca
[template-lte-gnb-epc]
_update_hash_filename_ = instance-gnb-epc.jinja2.cfg
md5sum =
f94c3e2f714629d9e1fc9b2f7c8eb586
md5sum =
b9a58fa4037d32fc1dc4f5ef89e6211a
[template-lte-gnb]
_update_hash_filename_ = instance-gnb.jinja2.cfg
md5sum =
6deb38b3de44f6e0a43b49fd13f0f072
md5sum =
0b74993990a0dfa3c6429dc4ac716826
[template-lte-epc]
_update_hash_filename_ = instance-epc.jinja2.cfg
md5sum =
089f62e736cdc620eafc2c47b050fe13
md5sum =
35556ebd82be804584482a7fe5eff0be
[ue_db.jinja2.cfg]
filename = config/ue_db.jinja2.cfg
...
...
software/ors-amarisoft/instance-enb-epc.jinja2.cfg
View file @
ed4be2ae
...
...
@@ -52,6 +52,12 @@ return = monitor-base-url
name = EPC
software-type = epc
config-name = epc
{% if slapparameter_dict.get("mme_config_link", None) %}
config-mme_config_link = {{ dumps(slapparameter_dict["mme_config_link"]) }}
{% endif %}
{% if slapparameter_dict.get("mme_config_version", None) %}
config-mme_config_version = {{ dumps(slapparameter_dict["mme_config_version"]) }}
{% endif %}
[lte-enb-request]
<= request-common-base
...
...
@@ -76,6 +82,12 @@ config-mme_addr = {{ dumps(slapparameter_dict["mme_addr"]) }}
{% if slapparameter_dict.get("enb_id", None) %}
config-enb_id = {{ dumps(slapparameter_dict["enb_id"]) }}
{% endif %}
{% if slapparameter_dict.get("enb_config_link", None) %}
config-enb_config_link = {{ dumps(slapparameter_dict["enb_config_link"]) }}
{% endif %}
{% if slapparameter_dict.get("enb_config_version", None) %}
config-enb_config_version = {{ dumps(slapparameter_dict["enb_config_version"]) }}
{% endif %}
[monitor-base-url-dict]
lte-epc-request = ${lte-epc-request:connection-monitor-base-url}
...
...
software/ors-amarisoft/instance-enb.jinja2.cfg
View file @
ed4be2ae
...
...
@@ -60,6 +60,14 @@ extensions = jinja2.ext.do
context =
section directory directory
{% if slapparameter_dict.get("enb_config_link", None) %}
[enb-config-dl]
recipe = slapos.recipe.build:download
url = {{ slapparameter_dict.get("enb_config_link") }}
version = {{ slapparameter_dict.get("enb_config_version") }}
offline = false
{% endif %}
[lte-enb-sh-wrapper]
recipe = slapos.recipe.template:jinja2
rendered = ${directory:bin}/${:_buildout_section_name_}
...
...
@@ -98,7 +106,11 @@ context =
[lte-enb-config]
<= config-base
{% if slapparameter_dict.get("enb_config_link", None) %}
template = ${enb-config-dl:target}
{% else %}
template = {{ enb_template }}
{% endif %}
rendered = ${directory:etc}/enb.cfg
[publish-connection-information]
...
...
software/ors-amarisoft/instance-epc.jinja2.cfg
View file @
ed4be2ae
...
...
@@ -58,6 +58,14 @@ extensions = jinja2.ext.do
context =
section directory directory
{% if slapparameter_dict.get("mme_config_link", None) %}
[mme-config-dl]
recipe = slapos.recipe.build:download
url = {{ slapparameter_dict.get("mme_config_link") }}
version = {{ slapparameter_dict.get("mme_config_version") }}
offline = false
{% endif %}
### IMS
[lte-ims-service]
recipe = slapos.cookbook:wrapper
...
...
@@ -122,7 +130,11 @@ rendered = ${directory:etc}/ims.cfg
[lte-mme-config]
<= config-base
{% if slapparameter_dict.get("mme_config_link", None) %}
template = ${mme-config-dl:target}
{% else %}
template = {{ mme_template }}
{% endif %}
rendered = ${directory:etc}/mme.cfg
context =
section directory directory
...
...
software/ors-amarisoft/instance-gnb-epc.jinja2.cfg
View file @
ed4be2ae
...
...
@@ -52,6 +52,12 @@ return = monitor-base-url
name = EPC
software-type = epc
config-name = epc
{% if slapparameter_dict.get("mme_config_link", None) %}
config-mme_config_link = {{ dumps(slapparameter_dict["mme_config_link"]) }}
{% endif %}
{% if slapparameter_dict.get("mme_config_version", None) %}
config-mme_config_version = {{ dumps(slapparameter_dict["mme_config_version"]) }}
{% endif %}
[lte-gnb-request]
<= request-common-base
...
...
@@ -79,6 +85,12 @@ config-mme_addr = {{ dumps(slapparameter_dict["mme_addr"]) }}
{% if slapparameter_dict.get("enb_id", None) %}
config-enb_id = {{ dumps(slapparameter_dict["enb_id"]) }}
{% endif %}
{% if slapparameter_dict.get("gnb_config_link", None) %}
config-gnb_config_link = {{ dumps(slapparameter_dict["gnb_config_link"]) }}
{% endif %}
{% if slapparameter_dict.get("gnb_config_version", None) %}
config-gnb_config_version = {{ dumps(slapparameter_dict["gnb_config_version"]) }}
{% endif %}
[monitor-base-url-dict]
lte-epc-request = ${lte-epc-request:connection-monitor-base-url}
...
...
software/ors-amarisoft/instance-gnb.jinja2.cfg
View file @
ed4be2ae
...
...
@@ -60,6 +60,14 @@ extensions = jinja2.ext.do
context =
section directory directory
{% if slapparameter_dict.get("gnb_config_link", None) %}
[gnb-config-dl]
recipe = slapos.recipe.build:download
url = {{ slapparameter_dict.get("gnb_config_link") }}
version = {{ slapparameter_dict.get("gnb_config_version") }}
offline = false
{% endif %}
[lte-enb-sh-wrapper]
recipe = slapos.recipe.template:jinja2
rendered = ${directory:bin}/${:_buildout_section_name_}
...
...
@@ -98,7 +106,11 @@ context =
[lte-gnb-config]
<= config-base
{% if slapparameter_dict.get("gnb_config_link", None) %}
template = ${gnb-config-dl:target}
{% else %}
template = {{ gnb_template }}
{% endif %}
rendered = ${directory:etc}/gnb.cfg
[publish-connection-information]
...
...
software/repman/buildout.hash.cfg
View file @
ed4be2ae
...
...
@@ -14,7 +14,7 @@
# not need these here).
[instance.cfg]
filename = instance.cfg.in
md5sum =
af2fc4a7a0f782fed2cb1112ef3cb397
md5sum =
1c9c4c254f371337fe08b7922901f8a9
[instance-repman.cfg]
_update_hash_filename_ = instance-repman.cfg.jinja2.in
...
...
@@ -34,7 +34,7 @@ md5sum = 0eeb24c6aa0760f0d33c4cc2828ddf30
[template-mariadb.cfg]
_update_hash_filename_ = instance-mariadb.cfg.jinja2.in
md5sum =
938f1e8087395757f5ae861d20500658
md5sum =
aa25693b324ce5acc00f29b96a2516c0
[template-my-cnf]
_update_hash_filename_ = templates/my.cnf.in
...
...
software/repman/instance-mariadb.cfg.jinja2.in
View file @
ed4be2ae
...
...
@@ -214,16 +214,10 @@ wait-for-files =
{{ supervisord_lib.supervisord_program("mariadb", maradb_program_dict) }}
{% do part_list.append("supervisord-mariadb") %}
[odbc-ini-text]
text = {{ dumps(base64.b64encode( slapparameter_dict.get('odbc-ini', '').encode() )) }}
[{{ section('odbc-ini') }}]
< = jinja2-template-base
rendered = ${directory:etc}/odbc.ini
template = inline:{% raw -%}
{{ parameter_dict['text'].decode('base64') }}
{%- endraw %}
context = section parameter_dict odbc-ini-text
recipe = slapos.recipe.template
output = ${directory:etc}/odbc.ini
inline = {{ dumps(slapparameter_dict.get('odbc-ini', '')) }}
[{{ section('logrotate-entry-mariadb') }}]
< = logrotate-entry-base
...
...
software/repman/instance.cfg.in
View file @
ed4be2ae
...
...
@@ -108,4 +108,3 @@ template = {{ template_mariadb }}
filename = instance-mariadb.cfg
extra-context =
section parameter_dict template-mariadb-parameters
import base64 base64
stack/erp5/buildout.hash.cfg
View file @
ed4be2ae
...
...
@@ -26,7 +26,7 @@ md5sum = d10b8e35b02b5391cf46bf0c7dbb1196
[template-mariadb]
filename = instance-mariadb.cfg.in
md5sum =
4a1e279e3757c964caaa27137fecb66f
md5sum =
2daa3aaa1263705c4628864230049c67
[template-kumofs]
filename = instance-kumofs.cfg.in
...
...
@@ -34,7 +34,7 @@ md5sum = cfe4696a67bf4886a5d8252a5274a941
[template-zope-conf]
filename = zope.conf.in
md5sum =
fb02a30a9af9ef9a4724048c548b6542
md5sum =
153fe68aa92452c3e2076d2ed26ff524
[site-zcml]
filename = site.zcml
...
...
@@ -70,7 +70,7 @@ md5sum = 274365ebbade26558ca4836837e781aa
[template]
filename = instance.cfg.in
md5sum =
ed280a76c22247cf2a05fac29b8a8b30
md5sum =
165b0a50672138ee4a3fbe9239af11ba
[template-erp5]
filename = instance-erp5.cfg.in
...
...
@@ -90,11 +90,11 @@ md5sum = 9c7bf69e24bc8964f3854a0bd3eebf2c
[template-balancer]
filename = instance-balancer.cfg.in
md5sum =
e0567c8d7717d1ed5daf4555566c76cd
md5sum =
8b4d6c29e9c5d8fb2e50e6ac96906d97
[template-haproxy-cfg]
filename = haproxy.cfg.in
md5sum =
4149e3e83c9981586ffa123d31a08908
md5sum =
d2d98ed3fafce764991b72371e3e09d5
[template-rsyslogd-cfg]
filename = rsyslogd.cfg.in
...
...
stack/erp5/haproxy.cfg.in
View file @
ed4be2ae
...
...
@@ -211,6 +211,6 @@ frontend frontend_{{ group_name }}
backend backend_{{ group_name }}_{{ name }}
http-request replace-path ^/{{ name }}(.*) /VirtualHostBase/https/{{ ip }}:{{ port }}/VirtualHostRoot/_vh_{{ name }}\1
timeout server 8h
server {{ name }} {{ urlparse.urlparse(url).netloc }}
server {{ name }} {{ url
lib_
parse.urlparse(url).netloc }}
{%- endfor %}
{% endfor %}
stack/erp5/instance-balancer.cfg.in
View file @
ed4be2ae
...
...
@@ -205,7 +205,7 @@ template = {{ parameter_dict['template-haproxy-cfg'] }}
rendered = ${directory:etc}/haproxy.cfg
context =
section parameter_dict haproxy-cfg-parameter-dict
import url
parse url
parse
import url
lib_parse six.moves.urllib.
parse
extensions = jinja2.ext.do
[haproxy-reload]
...
...
stack/erp5/instance-mariadb.cfg.in
View file @
ed4be2ae
...
...
@@ -197,15 +197,9 @@ environ =
[{{ section('odbc-ini') }}]
< = jinja2-template-base
rendered = ${directory:etc}/odbc.ini
template = inline:{% raw -%}
{{ base64.b64decode(text).decode('utf-8') }}
{%- endraw %}
text = {{ dumps(base64.b64encode(slapparameter_dict.get('odbc-ini', '').encode('utf-8'))) }}
context =
key text :text
import base64 base64
recipe = slapos.recipe.template
output = ${directory:etc}/odbc.ini
inline = {{ dumps(slapparameter_dict.get('odbc-ini', '')) }}
[{{ section('logrotate-entry-mariadb') }}]
< = logrotate-entry-base
...
...
stack/erp5/instance.cfg.in
View file @
ed4be2ae
...
...
@@ -178,7 +178,6 @@ template = {{ template_mariadb }}
filename = instance-mariadb.cfg
extra-context =
section parameter_dict dynamic-template-mariadb-parameters
import base64 base64
# Keep a section for backward compatibility for removed types
# Once the section is removed, ghost instances will keep failing until
...
...
stack/erp5/zope.conf.in
View file @
ed4be2ae
...
...
@@ -130,17 +130,17 @@ trusted-proxy 0.0.0.0
%import {{ m }}
{% endfor -%}
{% set type_dict = {'neo': 'NEOStorage', 'zeo': 'zeoclient'} %}
{% for name, zodb_dict in
parameter_dict['zodb-dict'].iteritems(
) %}
{% for name, zodb_dict in
six.iteritems(parameter_dict['zodb-dict']
) %}
<zodb_db {{ name }}>
{%- set storage_type = type_dict[zodb_dict.pop('type')] %}
{%- set storage_dict = zodb_dict.pop('storage-dict') %}
{%- do root_common.apply_overrides(zodb_dict, node_id) %}
{%- for key, value in
zodb_dict.iteritems(
) %}
{%- for key, value in
six.iteritems(zodb_dict
) %}
{{ key }} {{ value }}
{%- endfor %}
<{{ storage_type }}>
{%- do root_common.apply_overrides(storage_dict, node_id) %}
{%- for key, value in s
torage_dict.iteritems(
) %}
{%- for key, value in s
ix.iteritems(storage_dict
) %}
{{ key }} {{ value }}
{%- endfor %}
</{{ storage_type }}>
...
...
stack/monitor/buildout.cfg
View file @
ed4be2ae
...
...
@@ -8,6 +8,7 @@ extends =
../../component/openssl/buildout.cfg
../../component/lxml-python/buildout.cfg
../../component/python-cryptography/buildout.cfg
../../component/randomsleep/buildout.cfg
../../stack/logrotate/buildout.cfg
../../stack/slapos.cfg
...
...
@@ -65,6 +66,7 @@ rendered = ${buildout:directory}/template-monitor.cfg
context =
key apache_location apache:location
key template_logrotate_base template-logrotate-base:rendered
key randomsleep randomsleep:output
raw monitor_bin ${buildout:bin-directory}/monitor.bootstrap
raw monitor_collect ${buildout:bin-directory}/monitor.collect
raw monitor_statistic ${buildout:bin-directory}/monitor.statistic
...
...
stack/monitor/buildout.hash.cfg
View file @
ed4be2ae
...
...
@@ -14,7 +14,7 @@
# not need these here).
[monitor2-template]
filename = instance-monitor.cfg.jinja2.in
md5sum =
3cba541a8b0b22c2648848ed1d25917
4
md5sum =
fb10eabe010d136764365c7df299381
4
[monitor-httpd-conf]
_update_hash_filename_ = templates/monitor-httpd.conf.in
...
...
stack/monitor/instance-monitor.cfg.jinja2.in
View file @
ed4be2ae
...
...
@@ -250,7 +250,7 @@ recipe = slapos.cookbook:cron.d
cron-entries = ${cron:cron-entries}
name = monitor-globalstate
frequency = */2 * * * *
command = {{
bin_directory }}/randomsleep
20 && ${monitor-globalstate-wrapper:wrapper-path}
command = {{
randomsleep }}
20 && ${monitor-globalstate-wrapper:wrapper-path}
[monitor-globalstate-first-run]
recipe = plone.recipe.command
...
...
@@ -262,14 +262,14 @@ recipe = slapos.cookbook:cron.d
cron-entries = ${cron:cron-entries}
name = monitor-configurator
frequency = * * * * *
command = {{
bin_directory }}/randomsleep
10 && ${monitor-configurator-wrapper:wrapper-path}
command = {{
randomsleep }}
10 && ${monitor-configurator-wrapper:wrapper-path}
[monitor-collect-cron-entry]
recipe = slapos.cookbook:cron.d
cron-entries = ${cron:cron-entries}
name = monitor_collect
frequency = * * * * *
command = {{
bin_directory }}/randomsleep
40 && ${monitor-collect-wrapper:wrapper-path}
command = {{
randomsleep }}
40 && ${monitor-collect-wrapper:wrapper-path}
[logrotate-entry-monitor-data]
recipe = collective.recipe.template
...
...
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