Commit 39cf89fa authored by Niels van Dijk's avatar Niels van Dijk
Browse files

Updated signer_tld to tld; fix issue to check inventory hostname in proxies config

parent c0891863
---
signers_tld: srv.mdx.incubator.geant.org
signers:
et2:
hostname: srv1
alias: mdx.et2.hu
mdsigner:
test:
name: hsm_signer
type: hsm_signer
key_spec: pkcs11:///usr/lib/softhsm/libsofthsm2.so/test?pin=secret
mdxcdn:
......@@ -16,7 +14,7 @@ signers:
alias: mdx.cdn.nl
mdsigner:
edugain:
name: hsm_signer
type: hsm_signer
key_spec: pkcs11:///usr/lib/softhsm/libsofthsm2.so/test?pin=secret
alternative-mdx:
......@@ -24,7 +22,7 @@ signers:
alias: mdx.alternative.nl
mdsigner:
test:
name: normal_signer
type: normal_signer
key_spec: "test.key"
cert_spec: "test.crt"
foobar:
......
{% if signers is defined and signers[inventory_hostname].get('mdsigner') %}
# Signer configuration
<VirtualHost *:80>
ServerName {{ signers[inventory_hostname]['hostname'] }}-signer.{{ signers_tld }}
ServerName {{ signers[inventory_hostname]['hostname'] }}-signer.{{ tld }}
{% if signers[inventory_hostname].get('alias') %}
ServerAlias {{ signers[inventory_hostname]['alias'] }}
{% endif %}
......@@ -12,6 +12,8 @@
</VirtualHost>
{% endif %}
{% if proxies is defined and proxies.get(inventory_hostname) %}
{% if proxies is defined and proxies[inventory_hostname].get('mdproxy') %}
# Global proxy configuration
<VirtualHost *:80>
......@@ -41,3 +43,4 @@
{% endfor %}
{% endif %}
{% endif %}
......@@ -3,7 +3,7 @@
{% for realm, values in mdsigners.items() %}
{{ realm }}:
signer:
name: {{ values['name'] }}
name: {{ values.type }}
key_spec: {{ values.key_spec }}
cert_spec: {{ values.get('cert_spec') }}
metadir: metadata/{{ realm }}
......
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