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
Lisa Casino
slapos
Commits
5024cfdd
Commit
5024cfdd
authored
Feb 18, 2016
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos-master: Fix parameter propagation on the templates
parent
34c35a0b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
9 deletions
+14
-9
software/slapos-master/apache.conf.in
software/slapos-master/apache.conf.in
+2
-2
software/slapos-master/instance-balancer.cfg.in
software/slapos-master/instance-balancer.cfg.in
+6
-4
software/slapos-master/instance-erp5.cfg.in
software/slapos-master/instance-erp5.cfg.in
+3
-0
software/slapos-master/software.cfg
software/slapos-master/software.cfg
+3
-3
No files found.
software/slapos-master/apache.conf.in
View file @
5024cfdd
...
@@ -74,8 +74,8 @@ Listen {{ ip }}:{{ port }}
...
@@ -74,8 +74,8 @@ Listen {{ ip }}:{{ port }}
{% if enable_authentication -%}
{% if enable_authentication -%}
SSLVerifyClient require
SSLVerifyClient require
RequestHeader set REMOTE_USER %{SSL_CLIENT_S_DN_CN}s
RequestHeader set REMOTE_USER %{SSL_CLIENT_S_DN_CN}s
SSLCACertificateFile {{ parameter_dict['s
ingle
-ca-cert'] }}
SSLCACertificateFile {{ parameter_dict['s
hared
-ca-cert'] }}
SSLCARevocationPath {{ parameter_dict['s
ingle
-crl'] }}
SSLCARevocationPath {{ parameter_dict['s
hared
-crl'] }}
LogFormat "%h %l %{REMOTE_USER}i %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %D" combined
LogFormat "%h %l %{REMOTE_USER}i %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %D" combined
...
...
software/slapos-master/instance-balancer.cfg.in
View file @
5024cfdd
...
@@ -136,10 +136,12 @@ ssl-session-cache = ${directory:log}/apache-ssl-session-cache
...
@@ -136,10 +136,12 @@ ssl-session-cache = ${directory:log}/apache-ssl-session-cache
# Client x509 auth
# Client x509 auth
ca-cert = ${apache-ssl-client:cert}
ca-cert = ${apache-ssl-client:cert}
crl = ${apache-ssl-client:crl}
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')) }}
{% if shared_ca_path -%}
single-crl = {{ dumps(ssl_parameter_dict.get('single-ca-crl')) }}
shared-ca-cert = {{ shared_ca_path }}/cacert.pem
{% endif -%}
shared-crl = {{ shared_ca_path }}/crl
{%- endif %}
[apache-conf]
[apache-conf]
...
...
software/slapos-master/instance-erp5.cfg.in
View file @
5024cfdd
...
@@ -291,6 +291,9 @@ config-{{ name }} = {{ ' ${' ~ zope_section_id ~ ':connection-zope-address-list}
...
@@ -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-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-backend-path = {{ dumps(balancer_dict.get('apache-backend-path', '/') % {'site-id': site_id}) }}
config-ssl = {{ dumps(balancer_dict.get('ssl', {})) }}
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]
[request-frontend-base]
{% if has_frontend -%}
{% if has_frontend -%}
...
...
software/slapos-master/software.cfg
View file @
5024cfdd
...
@@ -64,17 +64,17 @@ mode = 644
...
@@ -64,17 +64,17 @@ mode = 644
[template-erp5]
[template-erp5]
< = download-base-part
< = download-base-part
filename = instance-erp5.cfg.in
filename = instance-erp5.cfg.in
md5sum =
c7dc552383ab56b8a616b1bbc426b90b
md5sum =
6b7712c26dfdd105e8a1143d04839651
[template-balancer]
[template-balancer]
< = download-base-part
< = download-base-part
filename = instance-balancer.cfg.in
filename = instance-balancer.cfg.in
md5sum =
40b9bcb1a15049ba923146cd10a19cb7
md5sum =
02c258e51ff4619efe258bbf24b9ceed
[template-apache-conf]
[template-apache-conf]
< = download-base-part
< = download-base-part
filename = apache.conf.in
filename = apache.conf.in
md5sum =
b76e00ca343031423f7d724f68d19f76
md5sum =
77c9e3cd1e95279761310cd0eeda78b3
[template-create-erp5-site-real]
[template-create-erp5-site-real]
< = download-base-part
< = download-base-part
...
...
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