Fix mdserver config

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

roles/apache/templates/md.conf.j2

 {% 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