Index: package_branches/invirt-web/hvirt/files/etc/apache2/conf.invirt/cas.mako
===================================================================
--- package_branches/invirt-web/hvirt/files/etc/apache2/conf.invirt/cas.mako	(revision 2921)
+++ package_branches/invirt-web/hvirt/files/etc/apache2/conf.invirt/cas.mako	(revision 2922)
@@ -1,5 +1,7 @@
 <%page args="cfg, invirt_ssl" />
 
-Listen ${cfg.web.sites.cas.port}
+% if cfg.web.sites.cas.port not in [80, 443]:
+  Listen ${cfg.web.sites.cas.port}
+% endif
 CASLoginURL ${cfg.web.sites.cas.login}
 CASValidateURL ${cfg.web.sites.cas.validate}
Index: package_branches/invirt-web/hvirt/files/etc/apache2/conf.invirt/certs.mako
===================================================================
--- package_branches/invirt-web/hvirt/files/etc/apache2/conf.invirt/certs.mako	(revision 2921)
+++ package_branches/invirt-web/hvirt/files/etc/apache2/conf.invirt/certs.mako	(revision 2922)
@@ -1,5 +1,7 @@
 <%page args="cfg, invirt_ssl" />
 
-Listen ${cfg.web.sites.certs.port}
+% if cfg.web.sites.certs.port not in [80, 443]:
+  Listen ${cfg.web.sites.certs.port}
+% endif
 <VirtualHost *:${cfg.web.sites.certs.port}>
 	ServerAdmin ${cfg.web.errormail}
Index: package_branches/invirt-web/hvirt/files/etc/apache2/conf.invirt/default.mako
===================================================================
--- package_branches/invirt-web/hvirt/files/etc/apache2/conf.invirt/default.mako	(revision 2922)
+++ package_branches/invirt-web/hvirt/files/etc/apache2/conf.invirt/default.mako	(revision 2922)
@@ -0,0 +1,37 @@
+<%page args="cfg, invirt_ssl" />
+
+NameVirtualHost *:80
+<VirtualHost *:80>
+	ServerAdmin ${cfg.web.errormail}
+        ServerName ${cfg.web.hostname}:80
+	
+	DocumentRoot /var/www/invirt-web
+	<Directory /var/www/invirt-web>
+		Options Indexes FollowSymLinks MultiViews ExecCGI
+		AllowOverride None
+		Order allow,deny
+		allow from all
+	</Directory>
+
+	RewriteEngine On
+	RewriteRule ^/static(.*) - [L]
+	RewriteRule ^/admin/static(.*) /static/$1 [L]
+% for rewrite in cfg.web.sites.default.rewriterules:
+	RewriteRule ^/${rewrite.rule} ${rewrite.target} [${rewrite.type}]
+% endfor
+	RewriteRule ^/(.*) /var/www/invirt-web/unauth.fcgi/$1 [L]
+
+	ErrorLog /var/log/apache2/error.log
+
+	# Possible values include: debug, info, notice, warn, error, crit,
+	# alert, emerg.
+	LogLevel notice
+
+	CustomLog /var/log/apache2/access.log combined
+
+
+	ServerSignature On
+	% for redirect in cfg.web.sites.default.redirects:
+	  Redirect /${redirect.rule} ${redirect.target}
+	% endfor
+</VirtualHost>
Index: package_branches/invirt-web/hvirt/files/etc/apache2/conf.invirt/krb.mako
===================================================================
--- package_branches/invirt-web/hvirt/files/etc/apache2/conf.invirt/krb.mako	(revision 2921)
+++ package_branches/invirt-web/hvirt/files/etc/apache2/conf.invirt/krb.mako	(revision 2922)
@@ -1,5 +1,7 @@
 <%inherit "master.mako"/>
 
-Listen ${cfg.web.sites.krb.port}
+% if cfg.web.sites.krb.port not in [80, 443]:
+  Listen ${cfg.web.sites.krb.port}
+% endif
 <VirtualHost *:442>
 	ServerAdmin ${cfg.web.errormail}
Index: package_branches/invirt-web/hvirt/files/etc/apache2/conf.invirt/noauth.mako
===================================================================
--- package_branches/invirt-web/hvirt/files/etc/apache2/conf.invirt/noauth.mako	(revision 2921)
+++ package_branches/invirt-web/hvirt/files/etc/apache2/conf.invirt/noauth.mako	(revision 2922)
@@ -1,5 +1,7 @@
 <%page args="cfg, invirt_ssl" />
 
-Listen ${cfg.web.sites.noauth.port}
+% if cfg.web.sites.noauth.port not in [80, 443]:
+  Listen ${cfg.web.sites.noauth.port}
+% endif
 <VirtualHost *:${cfg.web.sites.noauth.port}>
 	ServerAdmin ${cfg.web.errormail}
Index: package_branches/invirt-web/hvirt/files/etc/apache2/conf.invirt/svn.mako
===================================================================
--- package_branches/invirt-web/hvirt/files/etc/apache2/conf.invirt/svn.mako	(revision 2921)
+++ package_branches/invirt-web/hvirt/files/etc/apache2/conf.invirt/svn.mako	(revision 2922)
@@ -1,5 +1,7 @@
 <%page args="cfg, invirt_ssl" />
 
-Listen ${cfg.web.sites.svn.port}
+% if cfg.web.sites.svn.port not in [80, 443]:
+  Listen ${cfg.web.sites.svn.port}
+% endif
 <VirtualHost *:${cfg.web.sites.svn.port}>
 	ServerAdmin ${cfg.web.errormail}