[pve-devel] r6128 - pve-installer/pve2

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-06-21 07:33:51 +0200 (Tue, 21 Jun 2011)
New Revision: 6128

Modified:
   pve-installer/pve2/changelog
   pve-installer/pve2/proxinstall
Log:


Modified: pve-installer/pve2/changelog
===================================================================
--- pve-installer/pve2/changelog	2011-06-21 04:41:23 UTC (rev 6127)
+++ pve-installer/pve2/changelog	2011-06-21 05:33:51 UTC (rev 6128)
@@ -19,6 +19,10 @@
 
   * use update-initramfs -c (instead of -u)
 
+  * do not write /etc/apache2/ports.conf (not really needed)
+
+  * enable apache port redirect (a2ensite pve-redirect.conf)
+
  -- Proxmox Support Team <support at proxmox.com>  Mon, 15 Feb 2010 14:09:46 +0100
 
 pve-installer (1.0-9) unstable; urgency=low

Modified: pve-installer/pve2/proxinstall
===================================================================
--- pve-installer/pve2/proxinstall	2011-06-21 04:41:23 UTC (rev 6127)
+++ pve-installer/pve2/proxinstall	2011-06-21 05:33:51 UTC (rev 6128)
@@ -797,9 +797,6 @@
 	    update_progress ((++$count)/$pkg_count, 0.5, 0.75);
 	}
 
-	# write apache2 ports file
- 	write_config ("Listen 80\nListen 443\n", "$targetdir/etc/apache2/ports.conf");
-
 	display_html ("extract4-virus.htm");
 
 	my $cmd = "chroot $targetdir dpkg --force-confold --configure -a";
@@ -843,6 +840,9 @@
 	write_config ("keyboard: $vnckmap\n", 
 		      "$targetdir/etc/pve-installer.cfg");
 
+	# enable apache port redirect
+	syscmd ("chroot $targetdir a2ensite pve-redirect.conf");
+
 	# set apt mirror
 	if (my $mirror = $cmap->{country}->{$country}->{mirror}) {
 	    my $fn = "$targetdir/etc/apt/sources.list";