Commit 5024cfdd authored by Rafael Monnerat's avatar Rafael Monnerat

slapos-master: Fix parameter propagation on the templates

parent 34c35a0b
......@@ -74,8 +74,8 @@ Listen {{ ip }}:{{ port }}
{% if enable_authentication -%}
SSLVerifyClient require
RequestHeader set REMOTE_USER %{SSL_CLIENT_S_DN_CN}s
SSLCACertificateFile {{ parameter_dict['single-ca-cert'] }}
SSLCARevocationPath {{ parameter_dict['single-crl'] }}
SSLCACertificateFile {{ parameter_dict['shared-ca-cert'] }}
SSLCARevocationPath {{ parameter_dict['shared-crl'] }}
LogFormat "%h %l %{REMOTE_USER}i %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %D" combined
......
......@@ -136,10 +136,12 @@ ssl-session-cache = ${directory:log}/apache-ssl-session-cache
# Client x509 auth
ca-cert = ${apache-ssl-client:cert}
crl = ${apache-ssl-client:crl}
{% if ssl_parameter_dict.get('single-ca-cert') and ssl_parameter_dict.get('single-ca-crl') -%}
single-ca-cert = {{ dumps(ssl_parameter_dict.get('single-ca-cert')) }}
single-crl = {{ dumps(ssl_parameter_dict.get('single-ca-crl')) }}
{% endif -%}
{% if shared_ca_path -%}
shared-ca-cert = {{ shared_ca_path }}/cacert.pem
shared-crl = {{ shared_ca_path }}/crl
{%- endif %}
[apache-conf]
......
......@@ -291,6 +291,9 @@ config-{{ name }} = {{ ' ${' ~ zope_section_id ~ ':connection-zope-address-list}
config-haproxy-server-check-path = {{ dumps(balancer_dict.get('haproxy-server-check-path', '/') % {'site-id': site_id}) }}
config-backend-path = {{ dumps(balancer_dict.get('apache-backend-path', '/') % {'site-id': site_id}) }}
config-ssl = {{ dumps(balancer_dict.get('ssl', {})) }}
config-backend-path-dict = {{ dumps(zope_backend_path_dict) }}
config-ssl-authentication-dict = {{ dumps(ssl_authentication_dict) }}
config-shared-certificate-authority-path = ${directory:ca-dir}
[request-frontend-base]
{% if has_frontend -%}
......
......@@ -64,17 +64,17 @@ mode = 644
[template-erp5]
< = download-base-part
filename = instance-erp5.cfg.in
md5sum = c7dc552383ab56b8a616b1bbc426b90b
md5sum = 6b7712c26dfdd105e8a1143d04839651
[template-balancer]
< = download-base-part
filename = instance-balancer.cfg.in
md5sum = 40b9bcb1a15049ba923146cd10a19cb7
md5sum = 02c258e51ff4619efe258bbf24b9ceed
[template-apache-conf]
< = download-base-part
filename = apache.conf.in
md5sum = b76e00ca343031423f7d724f68d19f76
md5sum = 77c9e3cd1e95279761310cd0eeda78b3
[template-create-erp5-site-real]
< = download-base-part
......
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