libravatar: let's keep the httpd conf template simple

Even though it means some virthost duplication for staging

inventory/group_vars/libravatar-stg

@@ -1,3 +1,6 @@
 resolvconf: "resolv.conf/cloud"
 git_branch: devel
 server_name: libravatar-stg.fedorainfracloud.org
+cdn_server_name: libravatar-stg.fedorainfracloud.org
+cdn_server_alias: libravatar-stg.fedorainfracloud.org
+server_redirect_name: libravatar-stg.fedorainfracloud.org

roles/libravatar/templates/httpd/libravatar.conf

@@ -17,7 +17,6 @@ RewriteEngine on
     RewriteRule "^/?(.*)" "https://%{HTTP_HOST}/$1" [L,R=301,NE]
 </VirtualHost>
 
-{% if cdn_server_name is defined and cdn_server_alias is defined %}
 <VirtualHost *:443>
     ServerName {{ cdn_server_name }}
     ServerAlias {{ cdn_server_alias }}
@@ -31,7 +30,6 @@ RewriteEngine on
 
     Include /etc/httpd/conf.d/libravatar-app.include
 </VirtualHost>
-{% endif %}
 
 <VirtualHost *:443>
     ServerName {{ server_name }}
@@ -46,7 +44,6 @@ RewriteEngine on
     Include /etc/httpd/conf.d/libravatar-app.include
 </VirtualHost>
 
-{% if server_redirect_name is defined %}
 <VirtualHost *:443>
     ServerAlias {{ server_redirect_name }}
 
@@ -57,7 +54,6 @@ RewriteEngine on
 
     RewriteRule "^/?(.*)" "https://{{ server_name }}/$1" [L,R=301,NE]
 </VirtualHost>
-{% endif %}
 
 <IfModule mod_status.c>
     ExtendedStatus On