From 61d4cbfeca37e9a55a7d55f77d37f756cb7d4215 Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Mon, 30 Apr 2012 10:58:52 +0200
Subject: [PATCH] set apache directory access options for all used dirs

This prevents errors when somebody enables /etc/apache/conf.d/security
---
 debian/changelog.Debian |  6 ++++++
 defines.mk              |  2 +-
 www/templates/pve.conf  | 20 ++++++++++++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/debian/changelog.Debian b/debian/changelog.Debian
index ce2e3106..eba5f992 100644
--- a/debian/changelog.Debian
+++ b/debian/changelog.Debian
@@ -1,3 +1,9 @@
+pve-manager (2.1-2) unstable; urgency=low
+
+  * set apache directory access options for all used dirs
+  
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 30 Apr 2012 11:00:49 +0200
+
 pve-manager (2.1-1) unstable; urgency=low
 
   * added Turkish translation
diff --git a/defines.mk b/defines.mk
index 437bc23b..e0bf8646 100644
--- a/defines.mk
+++ b/defines.mk
@@ -2,7 +2,7 @@ RELEASE=2.0
 
 VERSION=2.1
 PACKAGE=pve-manager
-PACKAGERELEASE=1
+PACKAGERELEASE=2
 
 BINDIR=${DESTDIR}/usr/bin
 PERLLIBDIR=${DESTDIR}/usr/share/perl5
diff --git a/www/templates/pve.conf b/www/templates/pve.conf
index 908bc72b..fcc35a9c 100644
--- a/www/templates/pve.conf
+++ b/www/templates/pve.conf
@@ -52,6 +52,26 @@ Listen 8006
 	Order allow,deny
 	allow from all
     </Directory>
+    <Directory /usr/share/pve-manager/css>
+	AllowOverride None
+	Order allow,deny
+	allow from all
+    </Directory>
+    <Directory /usr/share/pve-manager/ext4>
+	AllowOverride None
+	Order allow,deny
+	allow from all
+    </Directory>
+    <Directory /usr/share/pve-manager/images>
+	AllowOverride None
+	Order allow,deny
+	allow from all
+    </Directory>
+    <Directory /usr/share/vncterm>
+	AllowOverride None
+	Order allow,deny
+	allow from all
+    </Directory>
 
     Alias /pve2/css/ /usr/share/pve-manager/css/
     Alias /pve2/ext4 /usr/share/pve-manager/ext4/