Try to fix freshmaker server_name handling.

playbooks/groups/freshmaker.yml

@@ -61,7 +61,7 @@
   - role: freshmaker/frontend
     # TLS is terminated for us at the proxy layer (like for every other app).
     freshmaker_force_ssl: False
-    freshmaker_servername: {{inventory_hostname}}
+    freshmaker_servername: null
 
   handlers:
   - import_tasks: "{{ handlers_path }}/restart_services.yml"
@@ -78,7 +78,8 @@
 
   roles:
   - fedmsg/base
-  - freshmaker/backend
+  - role: freshmaker/backend
+    freshmaker_servername: freshmaker{{env_suffix}}.fedoraproject.org
 
   - role: keytab/service
     service: freshmaker

roles/freshmaker/base/templates/etc/freshmaker/config.py.j2

@@ -256,4 +256,6 @@ class ProdConfiguration(BaseConfiguration):
     ADMINS = {{ freshmaker_admins }}
 
     LOG_LEVEL = "{{ freshmaker_log_level }}"
+{% if freshmaker_servername %}
     SERVER_NAME = "{{ freshmaker_servername }}"
+{% else %}

roles/freshmaker/frontend/templates/etc/httpd/conf.d/freshmaker.conf.j2

@@ -8,7 +8,7 @@ RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI}
 WSGIDaemonProcess freshmaker user=fedmsg group=fedmsg processes={{wsgi_procs}} threads={{wsgi_threads}} home=/usr/share/freshmaker
 WSGIScriptAlias /{{ freshmaker_endpoint }} /usr/share/freshmaker/freshmaker.wsgi
 
-{% if freshmaker_servername != inventory_hostname %}
+{% if freshmaker_servername != inventory_hostname and freshmaker_servername != None %}
 # Redirect from the hostname of this machine to user-visible hostname.
 RewriteEngine On
 <If "%{HTTP_HOST} == '{{ inventory_hostname }}'">