From 0da5d836e2ad87c8b2dbb6036755df548a5a9b53 Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Fri, 2 Feb 2018 15:29:46 +0000
Subject: [PATCH] Fix redirect and servername issue in freshmaker role.

---
 playbooks/groups/freshmaker.yml                    |  1 +
 .../templates/etc/httpd/conf.d/freshmaker.conf.j2  | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/playbooks/groups/freshmaker.yml b/playbooks/groups/freshmaker.yml
index 3d2ac7d730..a92aa74b9f 100644
--- a/playbooks/groups/freshmaker.yml
+++ b/playbooks/groups/freshmaker.yml
@@ -61,6 +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: freshmaker{{env_suffix}}.fedoraproject.org
 
   handlers:
   - import_tasks: "{{ handlers_path }}/restart_services.yml"
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 213002c28e..4ae0fca4fb 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,13 +8,13 @@ RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI}
 WSGIDaemonProcess freshmaker user=fedmsg group=fedmsg threads=5 home=/usr/share/freshmaker
 WSGIScriptAlias /{{ freshmaker_endpoint }} /usr/share/freshmaker/freshmaker.wsgi
 
-{% if freshmaker_servername != inventory_hostname %}
-# Redirect from the hostname of this machine to user-visible hostname.
-RewriteEngine On
-<If "%{HTTP_HOST} == '{{ inventory_hostname }}'">
-RewriteRule (.*) "%{REQUEST_SCHEME}://{{ freshmaker_servername }}%{REQUEST_URI}" [R,L]
-</If>
-{% endif %}
+##{% if freshmaker_servername != inventory_hostname %}
+### Redirect from the hostname of this machine to user-visible hostname.
+##RewriteEngine On
+##<If "%{HTTP_HOST} == '{{ inventory_hostname }}'">
+##RewriteRule (.*) "%{REQUEST_SCHEME}://{{ freshmaker_servername }}%{REQUEST_URI}" [R,L]
+##</If>
+##{% endif %}
 
 {% if env == 'staging' %}
 OIDCOAuthClientID {{ freshmaker_stg_oidc_client_id }}