From 86c78df3f992c07570cf22d0f1f751f1872c0ef3 Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Fri, 9 Feb 2018 16:29:50 +0000
Subject: [PATCH] Try to fix freshmaker server_name handling.

---
 playbooks/groups/freshmaker.yml                              | 5 +++--
 roles/freshmaker/base/templates/etc/freshmaker/config.py.j2  | 2 ++
 .../frontend/templates/etc/httpd/conf.d/freshmaker.conf.j2   | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/playbooks/groups/freshmaker.yml b/playbooks/groups/freshmaker.yml
index a9e4586214..8eeb09cdff 100644
--- a/playbooks/groups/freshmaker.yml
+++ b/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
diff --git a/roles/freshmaker/base/templates/etc/freshmaker/config.py.j2 b/roles/freshmaker/base/templates/etc/freshmaker/config.py.j2
index 092bed3980..1db04ae470 100644
--- a/roles/freshmaker/base/templates/etc/freshmaker/config.py.j2
+++ b/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 %}
diff --git a/roles/freshmaker/frontend/templates/etc/httpd/conf.d/freshmaker.conf.j2 b/roles/freshmaker/frontend/templates/etc/httpd/conf.d/freshmaker.conf.j2
index 5ac8340005..9045aac568 100644
--- a/roles/freshmaker/frontend/templates/etc/httpd/conf.d/freshmaker.conf.j2
+++ b/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 }}'">