Merged revisions 2943-3026 from stable branch.

tbrehm

2012-04-05 b67344233b509c97ba118a209e82386d698ba068

 server/conf/nginx_vhost.conf.master

@@ -47,6 +47,31 @@
        error_page 500 /error/500.html;
        error_page 502 /error/502.html;
        error_page 503 /error/503.html;
        recursive_error_pages on;
        location = /error/400.html {
            internal;
        }
        location = /error/401.html {
            internal;
        }
        location = /error/403.html {
            internal;
        }
        location = /error/404.html {
            internal;
        }
        location = /error/405.html {
            internal;
        }
        location = /error/500.html {
            internal;
        }
        location = /error/502.html {
            internal;
        }
        location = /error/503.html {
            internal;
        }
</tmpl_if>
      
        error_log /var/log/ispconfig/httpd/<tmpl_var name='domain'>/error.log;
@@ -76,7 +101,7 @@
            auth_basic_user_file <tmpl_var name='stats_auth_passwd_file'>;
        }

        location /awstats-icon {
        location ^~ /awstats-icon {
            alias /usr/share/awstats/icon;
        }