From 6f8eb38dce99a92da182e076525125fbe0f82b62 Mon Sep 17 00:00:00 2001
From: Martin van Es <martin@mrvanes.com>
Date: Tue, 15 Feb 2022 14:58:44 +0100
Subject: [PATCH] Fix mdserver config
---
inventory/group_vars/all.yml | 6 +++---
roles/apache/templates/md.conf.j2 | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all.yml
index 08c27f1..a7b35b0 100644
--- a/inventory/group_vars/all.yml
+++ b/inventory/group_vars/all.yml
@@ -4,8 +4,8 @@ hosts:
et2.gndev.hexaa.eu:
hostname: srv1
tld: srv.mdx.incubator.geant.org
+ altname: 'server-md2.et2.com'
mdserver:
- altname: 'server-md2.et2.com'
test:
signer: hsm_signer
metadir: metadata/test
@@ -19,8 +19,8 @@ hosts:
mdxcdn.pt-38.utr.surfcloud.nl:
hostname: srv2
tld: srv.mdx.incubator.geant.org
+ altname: 'server-md2.et2.com'
mdserver:
- altname: 'server-md2.et2.com'
edugain:
signer: hsm_signer
metadir: metadata/edugain
@@ -42,8 +42,8 @@ hosts:
alternative-mdx.pt-76.utr.surfcloud.nl:
hostname: srv4
tld: srv.mdx.incubator.geant.org
+ altname: 'server-md.example.com'
mdserver:
- altname: 'server-md.example.com'
test:
signer: normal_signer
metadir: metadata/test
diff --git a/roles/apache/templates/md.conf.j2 b/roles/apache/templates/md.conf.j2
index f4ad694..42b23c1 100644
--- a/roles/apache/templates/md.conf.j2
+++ b/roles/apache/templates/md.conf.j2
@@ -1,8 +1,8 @@
{% if hosts[inventory_hostname].get('mdserver') %}
<VirtualHost *:80>
ServerName {{ hosts[inventory_hostname]['hostname'] }}-signer.{{ hosts[inventory_hostname]['tld'] }}
-{% if hosts[inventory_hostname]['mdserver'].get('altname') %}
- ServerAlias {{ hosts[inventory_hostname]['mdserver']['altname'] }}
+{% if hosts[inventory_hostname].get('altname') %}
+ ServerAlias {{ hosts[inventory_hostname]['altname'] }}
{% endif %}
DocumentRoot /var/www/html
AllowEncodedSlashes NoDecode
--
GitLab