From 68343520de98117bb007af4b265967aeaf625e47 Mon Sep 17 00:00:00 2001
From: Markos Chandras <mchandras@suse.de>
Date: Tue, 11 Jul 2017 14:15:23 +0100
Subject: [PATCH] templates: gnocchi-httpd: Ensure proper user control in
 gnocchi root

We need to ensure that /var/www/cgi-bin/ has proper user control since
different distributions place cgi-bin in different directories and as
such the default ones may not apply for aodh. For example, openSUSE
places it in /srv/www/cgi-bin and as such accessing the gnocchi
resources results to 403 HTTP errors.

Change-Id: I146190d56f2d68b84b52cc0c349add321fdf08cc
---
 templates/gnocchi-httpd.conf.j2 | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/templates/gnocchi-httpd.conf.j2 b/templates/gnocchi-httpd.conf.j2
index 4d36811..c77536b 100644
--- a/templates/gnocchi-httpd.conf.j2
+++ b/templates/gnocchi-httpd.conf.j2
@@ -28,3 +28,15 @@
     SSLOptions +StdEnvVars +ExportCertData
 {% endif %}
 </VirtualHost>
+
+<Directory "/var/www/cgi-bin">
+        AllowOverride None
+        Options +ExecCGI -Includes
+        <IfModule !mod_access_compat.c>
+                Require all granted
+        </IfModule>
+        <IfModule mod_access_compat.c>
+                Order allow,deny
+                Allow from all
+        </IfModule>
+</Directory>