[pve-devel] r6096 - in pve-manager/pve2: . www/templates

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-06-16 15:28:46 +0200 (Thu, 16 Jun 2011)
New Revision: 6096

Added:
   pve-manager/pve2/www/templates/pve-redirect.conf.in
Removed:
   pve-manager/pve2/www/templates/pve-redirect.conf
Modified:
   pve-manager/pve2/configure.in
   pve-manager/pve2/www/templates/Makefile.am
Log:
also redirect 443


Modified: pve-manager/pve2/configure.in
===================================================================
--- pve-manager/pve2/configure.in	2011-06-16 13:24:05 UTC (rev 6095)
+++ pve-manager/pve2/configure.in	2011-06-16 13:28:46 UTC (rev 6096)
@@ -60,6 +60,7 @@
 www/manager/Makefile
 www/images/Makefile
 www/templates/pve.conf
+www/templates/pve-redirect.conf
 ])
 
 #www/root/Makefile

Modified: pve-manager/pve2/www/templates/Makefile.am
===================================================================
--- pve-manager/pve2/www/templates/Makefile.am	2011-06-16 13:24:05 UTC (rev 6095)
+++ pve-manager/pve2/www/templates/Makefile.am	2011-06-16 13:28:46 UTC (rev 6096)
@@ -6,7 +6,7 @@
 	mv $@.tmp $@
 
 
-apache_DATA = $(BUILDDATA) pve-redirect.conf
+apache_DATA = $(BUILDDATA)
 
 apachedir = /etc/apache2/sites-available/
 
@@ -14,7 +14,7 @@
 
 vesampledir = /etc/vz/conf
 
-BUILDDATA = pve.conf
+BUILDDATA = pve.conf pve-redirect.conf
 
 CLEANFILES=*~ ve-pve.auto.conf-sample.tmp
 

Deleted: pve-manager/pve2/www/templates/pve-redirect.conf
===================================================================
--- pve-manager/pve2/www/templates/pve-redirect.conf	2011-06-16 13:24:05 UTC (rev 6095)
+++ pve-manager/pve2/www/templates/pve-redirect.conf	2011-06-16 13:28:46 UTC (rev 6096)
@@ -1,8 +0,0 @@
-<VirtualHost *:80>
-    #RewriteLog "/root/rewrite.log"
-    #RewriteLogLevel 10
-    RewriteEngine on
-    RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
-    RewriteRule .* - [F]
-    RewriteRule ^/(.*) https://%{HTTP_HOST}:8006/$1 [L,R]
-</VirtualHost>

Added: pve-manager/pve2/www/templates/pve-redirect.conf.in
===================================================================
--- pve-manager/pve2/www/templates/pve-redirect.conf.in	                        (rev 0)
+++ pve-manager/pve2/www/templates/pve-redirect.conf.in	2011-06-16 13:28:46 UTC (rev 6096)
@@ -0,0 +1,21 @@
+<VirtualHost *:80>
+    #RewriteLog "/root/rewrite.log"
+    #RewriteLogLevel 10
+    RewriteEngine on
+    RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
+    RewriteRule .* - [F]
+    RewriteRule ^/(.*) https://%{HTTP_HOST}:8006/$1 [L,R]
+</VirtualHost>
+
+<VirtualHost *:443>
+    SSLEngine on
+    SSLProtocol all -SSLv2
+    SSLCertificateFile @PROXMOX_ETC@/local/pve-ssl.pem
+    SSLCertificateKeyFile @PROXMOX_ETC@/local/pve-ssl.key
+
+    RewriteEngine on
+    RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
+    RewriteRule .* - [F]
+    RewriteRule ^/(.*) https://%{HTTP_HOST}:8006/$1 [L,R]
+</VirtualHost>
+