Commit 3877e338 authored by Aurel's avatar Aurel

more eggs & parts to remove after merge + fix haproxy for python3

parent 11a52804
......@@ -22,6 +22,7 @@ parts -=
rdiff-backup
ocropy
hookbox
jupyter-notebook-initialized-scripts
[rdiff-backup]
recipe =
......@@ -56,6 +57,14 @@ include-dirs -=
include-dirs +=
${cyrus-sasl:location}/include
[jupyter-notebook-initialized-scripts]
recipe =
eggs =
[instance-jupyter-notebook]
recipe =
[eggs]
eggs -=
# tracemalloc is now part of Python 3.4!
......@@ -69,6 +78,11 @@ eggs -=
xupdate_processor
SOAPpy
fpconst
${scipy:egg}
${scikit-learn:egg}
${scikit-image:egg}
eggs +=
docutils
Acquisition-patches = ${:_profile_base_location_}/../../component/egg-patch/Acquisition/aq_dynamic-4.5.patch#e923ab436d53282df536de3ef7d3e127
......
......@@ -26,7 +26,7 @@ md5sum = d10b8e35b02b5391cf46bf0c7dbb1196
[template-mariadb]
filename = instance-mariadb.cfg.in
md5sum = 7d064777c1c4e7b275b255db4f4b1da9
md5sum = f4e10df6253a76fcdb95458516ce9bdd
[template-kumofs]
filename = instance-kumofs.cfg.in
......@@ -34,7 +34,7 @@ md5sum = e91c0fbd0df441884f7422fa7976053c
[template-zope-conf]
filename = zope.conf.in
md5sum = c43da8f7b4db22e40a4864e6cfcaef44
md5sum = dedc3c3f09a09e4b3332869cab33e8db
[site-zcml]
filename = site.zcml
......@@ -66,11 +66,11 @@ md5sum = 0969fbb25b05c02ef3c2d437b2f4e1a0
[template-run-zelenium]
filename = run-zelenium-test.py.in
md5sum = cc19560b9400cecbd23064d55c501eec
md5sum = 6afc237458fcc0538dd7971c2e90aa96
[template]
filename = instance.cfg.in
md5sum = b5ac16fdeed8863e465e955ba6d1e12a
md5sum = 157e2b29840f92efe35bb3c199a9f751
[monitor-template-dummy]
filename = dummy.cfg
......@@ -78,23 +78,23 @@ md5sum = 68b329da9893e34099c7d8ad5cb9c940
[template-erp5]
filename = instance-erp5.cfg.in
md5sum = 5ea4bcdf74fb429f254af8e8fb7b38a3
md5sum = e31e23f40881878461a6099fa5e678aa
[template-zeo]
filename = instance-zeo.cfg.in
md5sum = 0648e38bd5d3a15bb9f93264932740b9
md5sum = 862d3b5309aa4d80bfa48703fcffbed0
[template-zope]
filename = instance-zope.cfg.in
md5sum = c03f93f95333e6a61b857dcfab7f9c0e
md5sum = a94362c9fd558159ad19199435c3b3fc
[template-balancer]
filename = instance-balancer.cfg.in
md5sum = 4a119083eab1eadbaf44468eb4f3381f
md5sum = 2d94a57ac26477e95b26e5b018310afa
[template-haproxy-cfg]
filename = haproxy.cfg.in
md5sum = 8de18a61607bd66341a44b95640d293f
md5sum = 7050d42ca7337dfca8acd977986d2a3a
[template-rsyslogd-cfg]
filename = rsyslogd.cfg.in
......
......@@ -204,6 +204,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 }} {{ urllib_parse.urlparse(url).netloc }}
{%- endfor %}
{% endfor %}
......@@ -38,7 +38,7 @@ mode = 644
{% set frontend_caucase_url_hash_list = [] -%}
{% for frontend_caucase_url in frontend_caucase_url_list -%}
{% set hash = hashlib.md5(frontend_caucase_url).hexdigest() -%}
{% set hash = hashlib.md5(six.ensure_binary(frontend_caucase_url)).hexdigest() -%}
{% do frontend_caucase_url_hash_list.append(hash) -%}
{% set data_dir = '${directory:client-cert-ca}/%s' % hash -%}
{{ caucase.updater(
......@@ -120,9 +120,9 @@ update-command = ${:command}
{% set haproxy_dict = {} -%}
{% set zope_virtualhost_monster_backend_dict = {} %}
{% set test_runner_url_dict = {} %} {# family_name => list of URLs #}
{% set next_port = itertools.count(slapparameter_dict['tcpv4-port']).next -%}
{% set port = itertools.count(slapparameter_dict['tcpv4-port']) -%}
{% for family_name, parameter_id_list in sorted(
slapparameter_dict['zope-family-dict'].iteritems()) -%}
slapparameter_dict['zope-family-dict'].items()) -%}
{% set zope_family_address_list = [] -%}
{% set ssl_authentication = slapparameter_dict['ssl-authentication-dict'].get(family_name, False) -%}
{% set has_webdav = [] -%}
......@@ -141,7 +141,7 @@ update-command = ${:command}
{% if test_runner_address_list -%}
{% set test_runner_backend_mapping = {} %}
{% set test_runner_balancer_url_list = [] %}
{% set test_runner_external_port = next_port() %}
{% set test_runner_external_port = next(port) %}
{% for i, (test_runner_internal_ip, test_runner_internal_port) in enumerate(test_runner_address_list) %}
{% do test_runner_backend_mapping.__setitem__(
'unit_test_' ~ i,
......@@ -169,9 +169,9 @@ update-command = ${:command}
# To keep port stable, we consume one port so that haproxy use the same port
# that apache was using before.
-#}
{% set _ = next_port() -%}
{% set _ = next(port) -%}
{% set haproxy_port = next_port() -%}
{% set haproxy_port = next(port) -%}
{% set backend_path = slapparameter_dict['backend-path-dict'][family_name] -%}
{% if has_webdav -%}
{% set external_scheme = 'webdavs' -%}
......@@ -203,7 +203,7 @@ template = {{ parameter_dict['template-haproxy-cfg'] }}
rendered = ${directory:etc}/haproxy.cfg
context =
section parameter_dict haproxy-cfg-parameter-dict
import urlparse urlparse
import urllib_parse
extensions = jinja2.ext.do
[haproxy-reload]
......@@ -304,7 +304,7 @@ certificate-and-key = ${directory:etc}/certificate-and-key-generated.pem
module = check_port_listening
name = haproxy.py
config-hostname = {{ ipv4 }}
config-port = {{ haproxy_dict.values()[0][0] }}
config-port = {{ list(haproxy_dict.values())[0][0] }}
[{{ section('publish') }}]
recipe = slapos.cookbook:publish.serialised
......@@ -382,7 +382,7 @@ config-command = "{{ parameter_dict["check-computer-memory-binary"] }}" -db ${mo
[monitor-instance-parameter]
monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }}
monitor-httpd-port = {{ next_port() }}
monitor-httpd-port = {{ next(port) }}
monitor-title = {{ slapparameter_dict['name'] }}
password = {{ slapparameter_dict['monitor-passwd'] }}
......
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