File 0001-change-install-dir-to-usr-share-openqa.diff of Package openQA

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-change-install-dir-to-usr-share-openqa.diff of Package openQA (Revision c3890a0237beea440fe3e3e7410e4d83)

Currently displaying revision c3890a0237beea440fe3e3e7410e4d83 , Show latest

From e4fd57fd7f0afda12e37551c88bed16e87409045 Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <ludwig.nussel@suse.de>
Date: Tue, 14 May 2013 17:41:42 +0200
Subject: [PATCH] change install dir to /usr/share/openqa

---
 etc/apache2/conf.d/openqa.conf | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/etc/apache2/conf.d/openqa.conf b/etc/apache2/conf.d/openqa.conf
index 06a0e08..afcf0eb 100644
--- a/etc/apache2/conf.d/openqa.conf
+++ b/etc/apache2/conf.d/openqa.conf
@@ -1,10 +1,6 @@
-Alias /openqa "/opt/openqa"
+Alias /openqa "/var/cache/openqa"
 
-<Directory "/opt">
-	Options +Indexes +FollowSymLinks
-</Directory>
-
-<Directory "/opt/openqa">
+<Directory "/var/cache/openqa">
 # symlinks needed for local mirror - e.g. /factory/repo/oss/boot/i386/branding
 	Options +Indexes +FollowSymLinks
 	AllowOverride None
@@ -20,8 +16,19 @@ Alias /openqa "/opt/openqa"
 	RewriteRule	^(.*)\.ogg$ cgi-bin/ogg/$1
 </Directory>
 
+<Directory "/usr/share/openqa/cgi-bin">
+	AllowOverride None
+	Options +ExecCGI -Includes
+	Order allow,deny
+	Allow from all
+</Directory>
+
+<Directory "/usr/share/openqa/htdocs">
+	DirectoryIndex index.html index.html.var index.shtml
+	AddOutputFilter INCLUDES .html
 
-<Directory "/srv/www/htdocs">
+	Order allow,deny
+	Allow from all
 	# by Bernhard:
 	Options +Includes +SymLinksifOwnerMatch
 	RewriteEngine  on
@@ -48,6 +55,3 @@ Alias /openqa "/opt/openqa"
 	RewriteRule	^pages/(..*)$ cgi-bin/pages/$1
 	RewriteRule	^$ cgi-bin/pages/index.html
 </Directory>
-
-DirectoryIndex index.html index.html.var index.shtml
-AddOutputFilter INCLUDES .html
-- 
1.8.1.4

Places

File 0001-change-install-dir-to-usr-share-openqa.diff of Package openQA (Revision c3890a0237beea440fe3e3e7410e4d83)

Places