aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--deployment/websites/templates/vhost_www.conf1
-rw-r--r--modules/apache/templates/00_default_vhosts.conf1
2 files changed, 1 insertions, 1 deletions
diff --git a/deployment/websites/templates/vhost_www.conf b/deployment/websites/templates/vhost_www.conf
index 01066cdf..9d00828d 100644
--- a/deployment/websites/templates/vhost_www.conf
+++ b/deployment/websites/templates/vhost_www.conf
@@ -8,5 +8,6 @@ RewriteRule ^g/(.+)$ http://static.mageia.org/g/$1 [R,L,QSA]
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
diff --git a/modules/apache/templates/00_default_vhosts.conf b/modules/apache/templates/00_default_vhosts.conf
index b045315f..25f59b5e 100644
--- a/modules/apache/templates/00_default_vhosts.conf
+++ b/modules/apache/templates/00_default_vhosts.conf
@@ -4,5 +4,4 @@
Allow from all
</Location>
Redirect / http://www.<%= domain %>/
- ErrorDocument 404 /var/www/html/404.php
</VirtualHost>