Index: deployment/websites/templates/vhost_www.conf
===================================================================
--- deployment/websites/templates/vhost_www.conf	(revision 2852)
+++ deployment/websites/templates/vhost_www.conf	(working copy)
@@ -8,5 +8,6 @@
 ProxyPass /old-wiki/        http://ryu.zarb.org/wiki
 ProxyPassReverse /old-wiki/ http://ryu.zarb.org/wiki
 
+ErrorDocument 404 /404.php
 
 php_value short_open_tag false
Index: modules/apache/templates/00_default_vhosts.conf
===================================================================
--- modules/apache/templates/00_default_vhosts.conf	(revision 2852)
+++ modules/apache/templates/00_default_vhosts.conf	(working copy)
@@ -4,5 +4,4 @@
 		Allow from all
 	</Location>
 	Redirect / http://www.<%= domain %>/
-	ErrorDocument 404 /var/www/html/404.php
 </VirtualHost>