diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2012-09-19 18:05:45 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2012-09-19 18:05:45 +0000 |
| commit | c8d40248bec55abae13b812a227123974a2072de (patch) | |
| tree | 1695ff79cf32cba4c6d0c2a629d79cdc32897f9a | |
| parent | a9c186a60c0115a7d10c79818568f6d08fb107d4 (diff) | |
| download | puppet-c8d40248bec55abae13b812a227123974a2072de.tar puppet-c8d40248bec55abae13b812a227123974a2072de.tar.gz puppet-c8d40248bec55abae13b812a227123974a2072de.tar.bz2 puppet-c8d40248bec55abae13b812a227123974a2072de.tar.xz puppet-c8d40248bec55abae13b812a227123974a2072de.zip | |
Move custom 404 config to www vhost only (patch from rda)
| -rw-r--r-- | deployment/websites/templates/vhost_www.conf | 1 | ||||
| -rw-r--r-- | modules/apache/templates/00_default_vhosts.conf | 1 |
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> |