Skip to content

slapos
slapos
Commit 98a5fab8 authored by Thomas Gambier's avatar Thomas Gambier 🚴🏼
Browse files
Options

Update release candidate

parents 0bbef436 7f0f8925
Hide whitespace changes
Inline Side-by-side
Showing with 134 additions and 102 deletions
component/babeld/buildout.cfg
View file @ 98a5fab8
[buildout] [buildout]
parts = babeld parts = babeld
[babeld-repository]
recipe = slapos.recipe.build:gitclone
repository = https://lab.nexedi.com/nexedi/babeld.git
branch = master
git-executable = ${git:location}/bin/git
revision = hmac-nxd1
[babeld] [babeld]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = https://lab.nexedi.com/nexedi/babeld/repository/archive.tar.gz?ref=v1.8.4-nxd1 path = ${babeld-repository:location}
md5sum = 536cca6abe34eb9faeda8682b80ee7bc make-options = CC='gcc -std=gnu99'
configure-command = configure-command =
echo "No configure.." echo "No configure.."
......
component/caddy/buildout.cfg
View file @ 98a5fab8
[buildout] [buildout]
extends = extends =
../../component/golang/buildout.cfg ../../component/golang/buildout.cfg
gowork.cfg
parts = parts =
gowork
caddy caddy
[gowork] [gowork]
# Caddy 1.x+ uses go modules, for which gowork does not work yet
golang = ${golang1.12:location} golang = ${golang1.12:location}
install = install =
github.com/mholt/caddy
[gowork.goinstall]
command = :
depends =
${caddy:recipe}
[caddy] [caddy]
recipe = slapos.recipe.cmmi # revision and repository can be used to control which caddy version is used
path = ${go_github.com_mholt_caddy:location} revision = v1.0.0
go = ${gowork:golang}/bin/go repository = github.com/mholt/caddy/caddy
configure-command = :
make-targets = recipe = plone.recipe.command
make-binary = cd ${:path}/caddy && ${:go} install -v update-command = ${:command}
environment = stop-on-error = True
PATH=${pkgconfig:location}/bin:${gowork:golang}/bin:${buildout:bin-directory}:%(PATH)s # GO111MODULE=on enables go modules support
GOPATH=${gowork:directory} # the chmod is needed as modules are fetched with u-w
command =
. ${gowork:env.sh} &&
cd ${gowork:directory} &&
export GO111MODULE=on &&
go get ${:repository}@${:revision} &&
chmod -R u+w .
output = ${gowork:bin}/caddy output = ${gowork:bin}/caddy
location = ${:output} location = ${:output}
component/caddy/gowork.cfg deleted 100644 → 0
View file @ 0bbef436
# Code generated by gowork-snapshot; DO NOT EDIT.
# list of go git repositories to fetch
[gowork.goinstall]
depends_gitfetch =
${go_github.com_mholt_caddy:recipe}
[go_github.com_mholt_caddy]
<= go-git-package
go.importpath = github.com/mholt/caddy
repository = https://lab.nexedi.com/nexedi/caddy.git
revision = nxd-v0.11.5-4-g9d3151db
component/geoip2/buildout.cfg
View file @ 98a5fab8
...@@ -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 = 579c2286209e9f9f6c8eb0035fa55974 md5sum = ff7bcb609291b9f5ab14397ccc506254
strip-top-level-dir = true strip-top-level-dir = true
component/golang/buildout.cfg
View file @ 98a5fab8
...@@ -64,8 +64,8 @@ environment-extra = ...@@ -64,8 +64,8 @@ environment-extra =
[golang1.12] [golang1.12]
<= golang-common <= golang-common
url = https://dl.google.com/go/go1.12.4.src.tar.gz url = https://dl.google.com/go/go1.12.6.src.tar.gz
md5sum = edb6bac6dc1ce0afc931d9e41ef3d2ef md5sum = 48a4141fc718dd742d106431294f08bf
# go1.11 needs go1.4 to bootstrap # go1.11 needs go1.4 to bootstrap
environment-extra = environment-extra =
......
software/caddy-frontend/buildout.hash.cfg
View file @ 98a5fab8
...@@ -102,7 +102,7 @@ md5sum = 89839a3f4ab71cab459afd1c27d00326 ...@@ -102,7 +102,7 @@ md5sum = 89839a3f4ab71cab459afd1c27d00326
[template-configuration-state-script] [template-configuration-state-script]
filename = templates/configuration-state-script.sh.in filename = templates/configuration-state-script.sh.in
md5sum = 00dfdc488548d1b14e89ba5f2f08fcb8 md5sum = 8d55aea0a4ebc262d2f7c2f96dd5428c
[template-rotate-script] [template-rotate-script]
filename = templates/rotate-script.sh.in filename = templates/rotate-script.sh.in
......
software/caddy-frontend/templates/configuration-state-script.sh.in
View file @ 98a5fab8
...@@ -8,9 +8,11 @@ touch $SIGNATURE_FILE ...@@ -8,9 +8,11 @@ touch $SIGNATURE_FILE
{{ sha256sum }} {{ path_list }} 2> /dev/null | sort -k 66 > $NSIGNATURE_FILE {{ sha256sum }} {{ path_list }} 2> /dev/null | sort -k 66 > $NSIGNATURE_FILE
if diff "$SIGNATURE_FILE" "$NSIGNATURE_FILE" > /dev/null ; then if diff "$SIGNATURE_FILE" "$NSIGNATURE_FILE" > /dev/null ; then
# No changes since last run just propagate information
rm -f ${NSIGNATURE_FILE} rm -f ${NSIGNATURE_FILE}
exit 1 exit 0
else else
# Changes since last run, so store new value and propagate information
mv "$NSIGNATURE_FILE" "$SIGNATURE_FILE" mv "$NSIGNATURE_FILE" "$SIGNATURE_FILE"
exit 0 exit 1
fi fi
software/caddy-frontend/test/test.py
View file @ 98a5fab8
...@@ -4782,12 +4782,29 @@ class TestSlaveSlapOSMasterCertificateCompatibility( ...@@ -4782,12 +4782,29 @@ class TestSlaveSlapOSMasterCertificateCompatibility(
@classmethod @classmethod
def setUpSlaves(cls): def setUpSlaves(cls):
_, cls.slave_key_pem, _, cls.slave_certificate_pem = \ _, cls.ssl_from_slave_key_pem, _, cls.ssl_from_slave_certificate_pem = \
createSelfSignedCertificate( createSelfSignedCertificate(
[ [
'*.customdomain.example.com', 'sslfromslave.example.com',
'*.example.com',
]) ])
_, cls.ssl_from_slave_kedifa_overrides_key_pem, _, \
cls.ssl_from_slave_kedifa_overrides_certificate_pem = \
createSelfSignedCertificate(
[
'sslfromslavekedifaoverrides.example.com',
])
_, cls.type_notebook_ssl_from_slave_key_pem, _, \
cls.type_notebook_ssl_from_slave_certificate_pem = \
createSelfSignedCertificate(
[
'typenotebooksslfromslave.example.com',
])
_, cls.type_notebook_ssl_from_slave_kedifa_overrides_key_pem, _, \
cls.type_notebook_ssl_from_slave_kedifa_overrides_certificate_pem = \
createSelfSignedCertificate(
[
'typenotebooksslfromslavekedifaoverrides.example.com',
])
cls.ca = CertificateAuthority( cls.ca = CertificateAuthority(
'TestSlaveSlapOSMasterCertificateCompatibility') 'TestSlaveSlapOSMasterCertificateCompatibility')
...@@ -4836,13 +4853,13 @@ class TestSlaveSlapOSMasterCertificateCompatibility( ...@@ -4836,13 +4853,13 @@ class TestSlaveSlapOSMasterCertificateCompatibility(
}, },
'ssl_from_slave': { 'ssl_from_slave': {
'url': cls.backend_url, 'url': cls.backend_url,
'ssl_crt': cls.slave_certificate_pem, 'ssl_crt': cls.ssl_from_slave_certificate_pem,
'ssl_key': cls.slave_key_pem, 'ssl_key': cls.ssl_from_slave_key_pem,
}, },
'ssl_from_slave_kedifa_overrides': { 'ssl_from_slave_kedifa_overrides': {
'url': cls.backend_url, 'url': cls.backend_url,
'ssl_crt': cls.slave_certificate_pem, 'ssl_crt': cls.ssl_from_slave_kedifa_overrides_certificate_pem,
'ssl_key': cls.slave_key_pem, 'ssl_key': cls.ssl_from_slave_kedifa_overrides_key_pem,
}, },
'custom_domain_ssl_crt_ssl_key': { 'custom_domain_ssl_crt_ssl_key': {
'url': cls.backend_url, 'url': cls.backend_url,
...@@ -4883,8 +4900,8 @@ class TestSlaveSlapOSMasterCertificateCompatibility( ...@@ -4883,8 +4900,8 @@ class TestSlaveSlapOSMasterCertificateCompatibility(
}, },
'type-notebook-ssl_from_slave': { 'type-notebook-ssl_from_slave': {
'url': cls.backend_url, 'url': cls.backend_url,
'ssl_crt': cls.slave_certificate_pem, 'ssl_crt': cls.type_notebook_ssl_from_slave_certificate_pem,
'ssl_key': cls.slave_key_pem, 'ssl_key': cls.type_notebook_ssl_from_slave_key_pem,
'type': 'notebook', 'type': 'notebook',
}, },
'type-notebook-ssl_from_master_kedifa_overrides': { 'type-notebook-ssl_from_master_kedifa_overrides': {
...@@ -4893,8 +4910,10 @@ class TestSlaveSlapOSMasterCertificateCompatibility( ...@@ -4893,8 +4910,10 @@ class TestSlaveSlapOSMasterCertificateCompatibility(
}, },
'type-notebook-ssl_from_slave_kedifa_overrides': { 'type-notebook-ssl_from_slave_kedifa_overrides': {
'url': cls.backend_url, 'url': cls.backend_url,
'ssl_crt': cls.slave_certificate_pem, 'ssl_crt':
'ssl_key': cls.slave_key_pem, cls.type_notebook_ssl_from_slave_kedifa_overrides_certificate_pem,
'ssl_key':
cls.type_notebook_ssl_from_slave_kedifa_overrides_key_pem,
'type': 'notebook', 'type': 'notebook',
} }
} }
...@@ -5079,7 +5098,7 @@ class TestSlaveSlapOSMasterCertificateCompatibility( ...@@ -5079,7 +5098,7 @@ class TestSlaveSlapOSMasterCertificateCompatibility(
parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path') parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path')
self.assertEqual( self.assertEqual(
self.slave_certificate_pem, self.ssl_from_slave_certificate_pem,
der2pem(result.peercert)) der2pem(result.peercert))
self.assertEqualResultJson(result, 'Path', '/test-path') self.assertEqualResultJson(result, 'Path', '/test-path')
...@@ -5111,7 +5130,7 @@ class TestSlaveSlapOSMasterCertificateCompatibility( ...@@ -5111,7 +5130,7 @@ class TestSlaveSlapOSMasterCertificateCompatibility(
parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path') parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path')
self.assertEqual( self.assertEqual(
self.slave_certificate_pem, self.ssl_from_slave_kedifa_overrides_certificate_pem,
der2pem(result.peercert)) der2pem(result.peercert))
self.assertEqualResultJson(result, 'Path', '/test-path') self.assertEqualResultJson(result, 'Path', '/test-path')
...@@ -5256,7 +5275,7 @@ class TestSlaveSlapOSMasterCertificateCompatibility( ...@@ -5256,7 +5275,7 @@ class TestSlaveSlapOSMasterCertificateCompatibility(
HTTPS_PORT) HTTPS_PORT)
self.assertEqual( self.assertEqual(
self.slave_certificate_pem, self.type_notebook_ssl_from_slave_certificate_pem,
der2pem(result.peercert)) der2pem(result.peercert))
self.assertEqualResultJson(result, 'Path', '/test-path') self.assertEqualResultJson(result, 'Path', '/test-path')
...@@ -5288,7 +5307,7 @@ class TestSlaveSlapOSMasterCertificateCompatibility( ...@@ -5288,7 +5307,7 @@ class TestSlaveSlapOSMasterCertificateCompatibility(
HTTPS_PORT) HTTPS_PORT)
self.assertEqual( self.assertEqual(
self.slave_certificate_pem, self.type_notebook_ssl_from_slave_kedifa_overrides_certificate_pem,
der2pem(result.peercert)) der2pem(result.peercert))
self.assertEqualResultJson(result, 'Path', '/test-path') self.assertEqualResultJson(result, 'Path', '/test-path')
......
software/caucase/buildout.hash.cfg
View file @ 98a5fab8
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
# not need these here). # not need these here).
[instance-caucased] [instance-caucased]
filename = instance-caucased.cfg.jinja2 filename = instance-caucased.cfg.jinja2
md5sum = 31dc85cce6e419235a92c3c7682a89d1 md5sum = 442e17a66b6f8d39f87903e147e3edaf
[instance] [instance]
filename = instance.cfg.jinja2 filename = instance.cfg.jinja2
......
software/caucase/instance-caucase-input-schema.json
View file @ 98a5fab8
...@@ -11,10 +11,7 @@ ...@@ -11,10 +11,7 @@
"default": 8009 "default": 8009
}, },
"external-url": { "external-url": {
"title": "External URL of base port", "$comment": "(deprecated)"
"description": "When provided, this URL will be added to issued certificate as the CRL distribution point.",
"type": "string",
"format": "uri"
}, },
"service-auto-approve-amount": { "service-auto-approve-amount": {
"title": "Number of service certificate requests to automatically approve", "title": "Number of service certificate requests to automatically approve",
......
software/caucase/instance-caucased.cfg.jinja2
View file @ 98a5fab8
{% import "caucase" as caucase with context %} {% import "caucase" as caucase with context %}
{% set ipv6 = (ipv6_set | list)[0] -%} {% set netloc = '[' ~ (ipv6_set | list)[0] ~ ']:' ~ slapparameter_dict.get('base-port', 8009) -%}
{% set netloc = '[' ~ ipv6 ~ ']:' ~ slapparameter_dict.get('base-port', 8009) -%}
[directory] [directory]
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
......
software/erp5/instance-erp5-input-schema.json
View file @ 98a5fab8
...@@ -111,6 +111,11 @@ ...@@ -111,6 +111,11 @@
}, },
"type": "object" "type": "object"
}, },
"wsgi": {
"description": "If set to true, Zope is run as a WSGI application, instead of using the Medusa HTTP server.",
"type": "boolean",
"default": false
},
"zope-partition-dict": { "zope-partition-dict": {
"description": "Zope layout definition", "description": "Zope layout definition",
"default": { "default": {
......
software/monitor/instance-monitor.cfg.jinja2
View file @ 98a5fab8
...@@ -68,16 +68,6 @@ mod-ssl = ${:cache}/httpd_mod_ssl ...@@ -68,16 +68,6 @@ mod-ssl = ${:cache}/httpd_mod_ssl
system-log = ${:private}/system-log system-log = ${:private}/system-log
consumption = ${:log}/consumption consumption = ${:log}/consumption
[monitor-httpd-configuration-file]
context =
import json_module json
section directory monitor-directory
section monitor_parameters monitor-parameters
section httpd_configuration monitor-httpd-configuration
section monitor_rewrite_rule monitor-rewrite-rule
section slave_information slap-configuration
key monitor_private_hash slap-configuration:private-hash
[python-symlink] [python-symlink]
recipe = plone.recipe.command recipe = plone.recipe.command
command = ln -sf {{ buildout_bin }}/pythonwitheggs ${monitor-directory:bin}/python command = ln -sf {{ buildout_bin }}/pythonwitheggs ${monitor-directory:bin}/python
......
software/monitor/software.cfg
View file @ 98a5fab8
...@@ -28,7 +28,7 @@ mode = 0644 ...@@ -28,7 +28,7 @@ mode = 0644
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-monitor.cfg.jinja2 url = ${:_profile_base_location_}/instance-monitor.cfg.jinja2
destination = ${buildout:directory}/template-base-monitor.cfg destination = ${buildout:directory}/template-base-monitor.cfg
md5sum = 2d9436dd6b116ee2e7cc7b30a6305475 md5sum = dffe797be3a66d6838ffc70ee8f5f3ff
mode = 0644 mode = 0644
[template-monitor-distributor] [template-monitor-distributor]
......
software/powerdns/instance-powerdns.cfg
View file @ 98a5fab8
...@@ -139,9 +139,6 @@ extra-context = ...@@ -139,9 +139,6 @@ extra-context =
{% endfor %} {% endfor %}
#################### ####################
# Monitoring
[monitor-rewrite-rule]
powerdns = http://$${pdns:local-ipv4}:$${pdns:webserver-port}/
[buildout] [buildout]
parts = parts =
......
software/powerdns/software.cfg
View file @ 98a5fab8
...@@ -25,7 +25,7 @@ mode = 0644 ...@@ -25,7 +25,7 @@ mode = 0644
[template-powerdns] [template-powerdns]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-powerdns.cfg url = ${:_profile_base_location_}/instance-powerdns.cfg
md5sum = e623ae588e14cbfda69e28a3002eaa29 md5sum = b2301de110ba95be46121dc18d7ca544
output = ${buildout:directory}/template-powerdns.cfg output = ${buildout:directory}/template-powerdns.cfg
mode = 0644 mode = 0644
......
software/re6stnet/software.cfg
View file @ 98a5fab8
...@@ -109,10 +109,10 @@ filename = registry-run.in ...@@ -109,10 +109,10 @@ filename = registry-run.in
md5sum = 0bf4f2c03e06b55c6c6cc55fa33e65d6 md5sum = 0bf4f2c03e06b55c6c6cc55fa33e65d6
[versions] [versions]
re6stnet = 0.520 re6stnet = 0.530
slapos.recipe.template = 4.3 slapos.recipe.template = 4.3
# Required by: # Required by:
# re6stnet==0.520 # re6stnet==0.530
miniupnpc = 1.9 miniupnpc = 1.9
software/slapos-master/buildout.hash.cfg
View file @ 98a5fab8
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
# not need these here). # not need these here).
[template-erp5] [template-erp5]
filename = instance-erp5.cfg.in filename = instance-erp5.cfg.in
md5sum = 0c929dcaba31e024d94c63c4aee181d6 md5sum = f3cc69df4d34d780af012260db9a4cf5
[template-balancer] [template-balancer]
filename = instance-balancer.cfg.in filename = instance-balancer.cfg.in
......
software/slapos-master/instance-erp5.cfg.in
View file @ 98a5fab8
...@@ -204,7 +204,7 @@ software-type = zope ...@@ -204,7 +204,7 @@ software-type = zope
{% set section_name = 'request-' ~ partition_name -%} {% set section_name = 'request-' ~ partition_name -%}
{% set zope_family = zope_parameter_dict.get('family', 'default') -%} {% set zope_family = zope_parameter_dict.get('family', 'default') -%}
{% do zope_family_name_list.append(zope_family) %} {% do zope_family_name_list.append(zope_family) %}
{% set backend_path = zope_parameter_dict.get('backend-path', '/') % {'site-id': site_id} %} {% set backend_path = zope_parameter_dict.get('backend-path', '') % {'site-id': site_id} %}
{# # default jupyter zope family is first zope family. -#} {# # default jupyter zope family is first zope family. -#}
{# # use list.append() to update it, because in jinja2 set changes only local scope. -#} {# # use list.append() to update it, because in jinja2 set changes only local scope. -#}
{% if not jupyter_zope_family_default -%} {% if not jupyter_zope_family_default -%}
...@@ -228,6 +228,7 @@ config-longrequest-logger-timeout = {{ dumps(zope_parameter_dict.get('longreques ...@@ -228,6 +228,7 @@ config-longrequest-logger-timeout = {{ dumps(zope_parameter_dict.get('longreques
config-large-file-threshold = {{ dumps(zope_parameter_dict.get('large-file-threshold', "10MB")) }} config-large-file-threshold = {{ dumps(zope_parameter_dict.get('large-file-threshold', "10MB")) }}
config-port-base = {{ dumps(zope_parameter_dict.get('port-base', 2200)) }} config-port-base = {{ dumps(zope_parameter_dict.get('port-base', 2200)) }}
config-webdav = {{ dumps(zope_parameter_dict.get('webdav', False)) }} config-webdav = {{ dumps(zope_parameter_dict.get('webdav', False)) }}
config-wsgi = {{ dumps(slapparameter_dict.get('wsgi', False)) }}
{% if test_runner_enabled -%} {% if test_runner_enabled -%}
config-test-runner-apache-url-list = ${publish-early:{{ zope_family }}-test-runner-url-list} config-test-runner-apache-url-list = ${publish-early:{{ zope_family }}-test-runner-url-list}
{% endif -%} {% endif -%}
...@@ -452,9 +453,6 @@ name = neo-${gen-neo-cluster-base:passwd} ...@@ -452,9 +453,6 @@ name = neo-${gen-neo-cluster-base:passwd}
[gen-smtpd-sasl-password] [gen-smtpd-sasl-password]
< = gen-password < = gen-password
[monitor-instance-parameter]
monitor-httpd-port = 8386
{{ root_common.common_section() }} {{ root_common.common_section() }}
[monitor-conf-parameters] [monitor-conf-parameters]
......
software/slaprunner/buildout.hash.cfg
View file @ 98a5fab8
...@@ -18,7 +18,7 @@ md5sum = c44a7481bb85e3258128afe3fcf23f44 ...@@ -18,7 +18,7 @@ md5sum = c44a7481bb85e3258128afe3fcf23f44
[template-runner] [template-runner]
filename = instance-runner.cfg filename = instance-runner.cfg
md5sum = 8f1da15d78ed08d9904ae94844a6893d md5sum = a5e2ae493b78a0f42d61cc79a0b2e686
[template-runner-import-script] [template-runner-import-script]
filename = template/runner-import.sh.jinja2 filename = template/runner-import.sh.jinja2
......
software/slaprunner/instance-runner-input-schema.json
View file @ 98a5fab8
...@@ -115,12 +115,17 @@ ...@@ -115,12 +115,17 @@
], ],
"default": "false" "default": "false"
}, },
"monitor-port": { "slaprunner-httpd-port": {
"title": "Webrunner Server Port",
"description": "Port of the Apache server serving the Webrunner interface.",
"type": "integer",
"default": 9686
},
"monitor-httpd-port": {
"title": "Monitor Port", "title": "Monitor Port",
"description": "Allow to manually change the port on wich the apache server running monitoring interface is listening. The default value for the webrunner is different from the default value of the standalone stack-monitor server (default 9684)", "description": "Port of the Apache server serving the monitoring interface.",
"type": "integer", "type": "integer",
"minimum": 9683, "default": 8386
"exclusiveMinimum": true
}, },
"monitor-interface-url": { "monitor-interface-url": {
"title": "Monitor Web Interface URL", "title": "Monitor Web Interface URL",
......
software/slaprunner/instance-runner.cfg
View file @ 98a5fab8
...@@ -170,7 +170,7 @@ pidfile-instance = $${directory:run}/slapgrid-sr.pid ...@@ -170,7 +170,7 @@ pidfile-instance = $${directory:run}/slapgrid-sr.pid
ssh_client = ${openssh:location}/bin/ssh ssh_client = ${openssh:location}/bin/ssh
public_key = $${runner-sshd-raw-server:rsa-keyfile}.pub public_key = $${runner-sshd-raw-server:rsa-keyfile}.pub
private_key = $${runner-sshd-raw-server:rsa-keyfile} private_key = $${runner-sshd-raw-server:rsa-keyfile}
instance-monitor-url = https://[$${:ipv6}]:$${monitor-parameters:port} instance-monitor-url = https://[$${:ipv6}]:$${slap-parameter:monitor-httpd-port}
etc_dir = $${directory:etc} etc_dir = $${directory:etc}
log_dir = $${directory:log} log_dir = $${directory:log}
run_dir = $${directory:run} run_dir = $${directory:run}
...@@ -413,7 +413,6 @@ project_public_folder = $${runnerdirectory:public-project} ...@@ -413,7 +413,6 @@ project_public_folder = $${runnerdirectory:public-project}
runner_home = $${runnerdirectory:home} runner_home = $${runnerdirectory:home}
git_http_backend = ${git:location}/libexec/git-core/git-http-backend git_http_backend = ${git:location}/libexec/git-core/git-http-backend
cgid_sock = $${directory:run}/cgid.sock cgid_sock = $${directory:run}/cgid.sock
#cgi_httpd_conf = $${monitor-httpd-configuration-file:rendered}
httpd_cors_file = $${slaprunner-httpd-cors:location} httpd_cors_file = $${slaprunner-httpd-cors:location}
[httpd-conf] [httpd-conf]
...@@ -669,18 +668,12 @@ slapos-reference = 1.0 ...@@ -669,18 +668,12 @@ slapos-reference = 1.0
auto-deploy = false auto-deploy = false
auto-deploy-instance = true auto-deploy-instance = true
autorun = false autorun = false
slaprunner-httpd-port = $${:monitor-port} slaprunner-httpd-port = 9686
# XXX - for backward compatibility, monitor-port was for slaprunner httpd server
monitor-port = 9686
instance-name = instance-name =
monitor-cors-domains = monitor-cors-domains =
monitor-interface-url = monitor-interface-url =
# XXX - define a new port for monitor here and use monitor-port for backward compatibility
monitor-httpd-port = 8386 monitor-httpd-port = 8386
[monitor-parameters]
port = $${slap-parameter:monitor-port}
[slapos-cfg] [slapos-cfg]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
template = ${template-slapos-cfg:location}/${template-slapos-cfg:filename} template = ${template-slapos-cfg:location}/${template-slapos-cfg:filename}
......
stack/caucase/buildout.cfg
View file @ 98a5fab8
...@@ -15,6 +15,8 @@ scripts = ...@@ -15,6 +15,8 @@ scripts =
caucase caucase
caucase-probe caucase-probe
caucase-updater caucase-updater
caucase-rerequest
caucase-key-id
caucased caucased
caucased-manage caucased-manage
......
stack/erp5/buildout.cfg
View file @ 98a5fab8
...@@ -564,18 +564,25 @@ eggs = ${neoppod:eggs} ...@@ -564,18 +564,25 @@ eggs = ${neoppod:eggs}
unidiff unidiff
jsonpickle jsonpickle
# WSGI server
zope.globalrequest
waitress
# parameterizing the version of the generated python interpreter name by the # parameterizing the version of the generated python interpreter name by the
# python section version causes dependency between this egg section and the # python section version causes dependency between this egg section and the
# installation of python, which we don't want on an instance # installation of python, which we don't want on an instance
interpreter = ${buildout:python} interpreter = ${buildout:python}
entry-points =
runwsgi=Products.ERP5.bin.zopewsgi:runwsgi
scripts = scripts =
apachedex apachedex
repozo repozo
runwsgi
runzope runzope
runzeo runzeo
tidstoraged tidstoraged
tidstorage_repozo tidstorage_repozo
web_checker_utility = erp5.util.webchecker:web_checker_utility web_checker_utility
extra-paths = extra-paths =
${erp5:location} ${erp5:location}
...@@ -739,6 +746,8 @@ zbarlight = 2.0 ...@@ -739,6 +746,8 @@ zbarlight = 2.0
cloudpickle = 0.5.3 cloudpickle = 0.5.3
dask = 0.18.1 dask = 0.18.1
toolz = 0.9.0 toolz = 0.9.0
zope.globalrequest = 1.5
waitress = 1.3.0
# Re-add for as it is required to be there for uninstallation # Re-add for as it is required to be there for uninstallation
erp5.recipe.w3validator = 1.0.2 erp5.recipe.w3validator = 1.0.2
......
stack/erp5/buildout.hash.cfg
View file @ 98a5fab8
...@@ -34,7 +34,7 @@ md5sum = 13315c109deab534b81e7a45e7320eea ...@@ -34,7 +34,7 @@ md5sum = 13315c109deab534b81e7a45e7320eea
[template-zope-conf] [template-zope-conf]
filename = zope.conf.in filename = zope.conf.in
md5sum = adb25a1ab15c8aecf40a3952528f81c2 md5sum = 114e0ac43281b943931754ed317ebc36
[site-zcml] [site-zcml]
filename = site.zcml filename = site.zcml
...@@ -78,7 +78,7 @@ md5sum = d41d8cd98f00b204e9800998ecf8427e ...@@ -78,7 +78,7 @@ md5sum = d41d8cd98f00b204e9800998ecf8427e
[template-erp5] [template-erp5]
filename = instance-erp5.cfg.in filename = instance-erp5.cfg.in
md5sum = ff2f4d9f806fa783421d34204f2a74c8 md5sum = fdecf814ba21b519612317061c2bd097
[template-zeo] [template-zeo]
filename = instance-zeo.cfg.in filename = instance-zeo.cfg.in
...@@ -86,7 +86,7 @@ md5sum = 10a01b85c966ad9fe13bc981f1ddabe8 ...@@ -86,7 +86,7 @@ md5sum = 10a01b85c966ad9fe13bc981f1ddabe8
[template-zope] [template-zope]
filename = instance-zope.cfg.in filename = instance-zope.cfg.in
md5sum = d9da770b4a83a58db8637f0eba97f4e8 md5sum = 646f10824178eaa817cdef3479853bcf
[template-balancer] [template-balancer]
filename = instance-balancer.cfg.in filename = instance-balancer.cfg.in
......
stack/erp5/instance-erp5.cfg.in
View file @ 98a5fab8
...@@ -203,7 +203,7 @@ software-type = zope ...@@ -203,7 +203,7 @@ software-type = zope
{% set section_name = 'request-' ~ partition_name -%} {% set section_name = 'request-' ~ partition_name -%}
{% set zope_family = zope_parameter_dict.get('family', 'default') -%} {% set zope_family = zope_parameter_dict.get('family', 'default') -%}
{% do zope_family_name_list.append(zope_family) %} {% do zope_family_name_list.append(zope_family) %}
{% set backend_path = zope_parameter_dict.get('backend-path', '/') % {'site-id': site_id} %} {% set backend_path = zope_parameter_dict.get('backend-path', '') % {'site-id': site_id} %}
{# # default jupyter zope family is first zope family. -#} {# # default jupyter zope family is first zope family. -#}
{# # use list.append() to update it, because in jinja2 set changes only local scope. -#} {# # use list.append() to update it, because in jinja2 set changes only local scope. -#}
{% if not jupyter_zope_family_default -%} {% if not jupyter_zope_family_default -%}
...@@ -227,6 +227,7 @@ config-longrequest-logger-timeout = {{ dumps(zope_parameter_dict.get('longreques ...@@ -227,6 +227,7 @@ config-longrequest-logger-timeout = {{ dumps(zope_parameter_dict.get('longreques
config-large-file-threshold = {{ dumps(zope_parameter_dict.get('large-file-threshold', "10MB")) }} config-large-file-threshold = {{ dumps(zope_parameter_dict.get('large-file-threshold', "10MB")) }}
config-port-base = {{ dumps(zope_parameter_dict.get('port-base', 2200)) }} config-port-base = {{ dumps(zope_parameter_dict.get('port-base', 2200)) }}
config-webdav = {{ dumps(zope_parameter_dict.get('webdav', False)) }} config-webdav = {{ dumps(zope_parameter_dict.get('webdav', False)) }}
config-wsgi = {{ dumps(slapparameter_dict.get('wsgi', False)) }}
{% if test_runner_enabled -%} {% if test_runner_enabled -%}
config-test-runner-apache-url-list = ${publish-early:{{ zope_family }}-test-runner-url-list} config-test-runner-apache-url-list = ${publish-early:{{ zope_family }}-test-runner-url-list}
{% endif -%} {% endif -%}
...@@ -409,9 +410,6 @@ name = neo-${gen-neo-cluster-base:passwd} ...@@ -409,9 +410,6 @@ name = neo-${gen-neo-cluster-base:passwd}
[gen-smtpd-sasl-password] [gen-smtpd-sasl-password]
< = gen-password < = gen-password
[monitor-instance-parameter]
monitor-httpd-port = 8386
{{ root_common.common_section() }} {{ root_common.common_section() }}
[monitor-conf-parameters] [monitor-conf-parameters]
......
stack/erp5/instance-zope.cfg.in
View file @ 98a5fab8
{% set wsgi = slapparameter_dict['wsgi'] -%}
{% set webdav = slapparameter_dict['webdav'] -%}
{% set use_ipv6 = slapparameter_dict.get('use-ipv6', False) -%} {% set use_ipv6 = slapparameter_dict.get('use-ipv6', False) -%}
{% set next_port = itertools.count(slapparameter_dict['port-base']).next -%} {% set next_port = itertools.count(slapparameter_dict['port-base']).next -%}
{% set site_id = slapparameter_dict['site-id'] -%} {% set site_id = slapparameter_dict['site-id'] -%}
...@@ -182,7 +184,11 @@ pem = {{dumps(storage_dict.pop(k))}} ...@@ -182,7 +184,11 @@ pem = {{dumps(storage_dict.pop(k))}}
[runzope-base] [runzope-base]
<= run-common <= run-common
instance-home = ${directory:instance} instance-home = ${directory:instance}
{% if wsgi -%}
wrapped-command-line = '{{ bin_directory }}/runwsgi' {% if webdav %}-w{% endif %} {{ ipv4 }}:${:port} '${:configuration-file}'
{% else -%}
wrapped-command-line = '{{ bin_directory }}/runzope' -C '${:configuration-file}' wrapped-command-line = '{{ bin_directory }}/runzope' -C '${:configuration-file}'
{%- endif %}
private-dev-shm = {{ slapparameter_dict['private-dev-shm'] }} private-dev-shm = {{ slapparameter_dict['private-dev-shm'] }}
[{{ section('zcml') }}] [{{ section('zcml') }}]
...@@ -249,13 +255,13 @@ tidstorage-port = {{ dumps(slapparameter_dict['tidstorage-port']) }} ...@@ -249,13 +255,13 @@ tidstorage-port = {{ dumps(slapparameter_dict['tidstorage-port']) }}
{% set thread_amount = slapparameter_dict['thread-amount'] -%} {% set thread_amount = slapparameter_dict['thread-amount'] -%}
{% set large_file_threshold = slapparameter_dict['large-file-threshold'] -%} {% set large_file_threshold = slapparameter_dict['large-file-threshold'] -%}
thread-amount = {{ thread_amount }} thread-amount = {{ thread_amount }}
{% set webdav = slapparameter_dict['webdav'] -%}
webdav = {{ dumps(webdav) }} webdav = {{ dumps(webdav) }}
{% if webdav -%} {% if webdav -%}
{% set timerserver_interval = 0 -%} {% set timerserver_interval = 0 -%}
{% else -%} {% else -%}
{% set timerserver_interval = slapparameter_dict['timerserver-interval'] -%} {% set timerserver_interval = slapparameter_dict['timerserver-interval'] -%}
{%- endif %} {%- endif %}
wsgi = {{ dumps(wsgi) }}
timerserver-interval = {{ dumps(timerserver_interval) }} timerserver-interval = {{ dumps(timerserver_interval) }}
[zope-conf-base] [zope-conf-base]
...@@ -315,6 +321,9 @@ context = ...@@ -315,6 +321,9 @@ context =
< = runzope-base < = runzope-base
wrapper-path = ${directory:service-on-watch}/{{ name }} wrapper-path = ${directory:service-on-watch}/{{ name }}
configuration-file = {{ '${' ~ conf_name ~ ':rendered}' }} configuration-file = {{ '${' ~ conf_name ~ ':rendered}' }}
{%- if wsgi %}
port = {{ port }}
{%- endif %}
[{{ section("promise-" ~ name) }}] [{{ section("promise-" ~ name) }}]
recipe = slapos.cookbook:check_port_listening recipe = slapos.cookbook:check_port_listening
......
stack/erp5/zope.conf.in
View file @ 98a5fab8
...@@ -22,15 +22,17 @@ rest-output-encoding utf-8 ...@@ -22,15 +22,17 @@ rest-output-encoding utf-8
# XXX: isn't this entry implicit ? # XXX: isn't this entry implicit ?
products {{ parameter_dict['instance-products'] }} products {{ parameter_dict['instance-products'] }}
{% if parameter_dict['webdav'] -%} {% if not parameter_dict['wsgi'] -%}
{% if parameter_dict['webdav'] -%}
<webdav-source-server> <webdav-source-server>
address {{ parameter_dict['ip'] }}:{{ parameter_dict['port'] }} address {{ parameter_dict['ip'] }}:{{ parameter_dict['port'] }}
force-connection-close off force-connection-close off
</webdav-source-server> </webdav-source-server>
{% else %} {% else %}
<http-server> <http-server>
address {{ parameter_dict['ip'] }}:{{ parameter_dict['port'] }} address {{ parameter_dict['ip'] }}:{{ parameter_dict['port'] }}
</http-server> </http-server>
{% endif %}
{%- endif %} {%- endif %}
<zoperunner> <zoperunner>
...@@ -68,7 +70,11 @@ large-file-threshold {{ parameter_dict['large-file-threshold'] }} ...@@ -68,7 +70,11 @@ large-file-threshold {{ parameter_dict['large-file-threshold'] }}
{% set timerserver_interval = parameter_dict['timerserver-interval'] -%} {% set timerserver_interval = parameter_dict['timerserver-interval'] -%}
{% if timerserver_interval -%} {% if timerserver_interval -%}
{% if parameter_dict['wsgi'] -%}
%import Products.TimerService.timerserver
{% else %}
%import timerserver %import timerserver
{% endif -%}
<timer-server> <timer-server>
interval {{ timerserver_interval }} interval {{ timerserver_interval }}
</timer-server> </timer-server>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7