From b406ec2d1c8378e77470265e160b0a92a2658734 Mon Sep 17 00:00:00 2001
From: Tim Flink <tflink@fedoraproject.org>
Date: Thu, 7 Apr 2016 15:20:14 +0000
Subject: [PATCH] reworking httpd config to work better on qa-stg01

---
 files/httpd/qadevel-virtualhost.conf.j2 | 24 +++++++++++++++++++-----
 inventory/group_vars/qa-stg             |  6 ++----
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/files/httpd/qadevel-virtualhost.conf.j2 b/files/httpd/qadevel-virtualhost.conf.j2
index 5cc83630a6..cca7a7afa2 100644
--- a/files/httpd/qadevel-virtualhost.conf.j2
+++ b/files/httpd/qadevel-virtualhost.conf.j2
@@ -1,8 +1,22 @@
 # this is meant for proxied stuff only, hence the lack of ssl
 
-Alias /{{ item.name }} {{ item.document_root }}
+<VirtualHost *:80>
+    # Change this to the domain which points to your host.
+    ServerName {{ item.name }}
 
-<Directory "{{ item.document_root }}">
-    Options Indexes FollowSymLinks
-    Require all granted
-</Directory>
+    DocumentRoot {{ item.document_root }}
+
+    ErrorLog "/var/log/httpd/{{ item.name }}.error_log"
+    CustomLog "/var/log/httpd/{{ item.name }}.access_log" common
+
+    <Directory "{{ item.document_root }}">
+        Options Indexes FollowSymLinks
+        Require all granted
+    </Directory>
+
+    <Location "/">
+        Options +Indexes
+        DirectoryIndex default.html
+    </Location>
+
+</VirtualHost>
diff --git a/inventory/group_vars/qa-stg b/inventory/group_vars/qa-stg
index e2679325a1..aef2c24224 100644
--- a/inventory/group_vars/qa-stg
+++ b/inventory/group_vars/qa-stg
@@ -78,10 +78,8 @@ tcp_ports: [ 80, 222, 443, "{{ buildslave_port }}", 3306 ]
 
 # static sites
 static_sites:
-  - name: docs
-    document_root: /srv/content/docs
-  - name: releases
-    document_root: /srv/content/releases
+  - name: {{ inventory_hostname }}
+    document_root: /srv/content
 
 sslonly: false