diff options
author | Dylan William Hardison <dylan@hardison.net> | 2017-10-06 18:28:33 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-06 18:28:33 +0200 |
commit | 6fe0afaa39271bbd75cf068abd67b19fd062a843 (patch) | |
tree | 78463f08c170191bae31b212a27e68cd1510a56f /httpd | |
parent | 350f370d64df2effbf8ef147d5fc744a3b01601f (diff) | |
download | bugzilla-6fe0afaa39271bbd75cf068abd67b19fd062a843.tar.gz bugzilla-6fe0afaa39271bbd75cf068abd67b19fd062a843.tar.xz |
Bug 1406235 - Cleanup httpd config and expose server limits as env settings
Diffstat (limited to 'httpd')
-rw-r--r-- | httpd/httpd.conf | 58 |
1 files changed, 16 insertions, 42 deletions
diff --git a/httpd/httpd.conf b/httpd/httpd.conf index 472b734fc..9df26b9db 100644 --- a/httpd/httpd.conf +++ b/httpd/httpd.conf @@ -1,60 +1,40 @@ +ServerName 127.0.0.1 ServerTokens Prod ServerRoot "/etc/httpd" +ServerAdmin root@localhost + PidFile /tmp/httpd.pid Timeout 60 KeepAlive Off MaxKeepAliveRequests 100 KeepAliveTimeout 15 -<IfModule prefork.c> -StartServers 8 -MinSpareServers 5 -MaxSpareServers 20 -ServerLimit 256 -MaxClients 256 -MaxRequestsPerChild 4000 -</IfModule> -<IfModule worker.c> -StartServers 4 -MaxClients 300 -MinSpareThreads 25 -MaxSpareThreads 75 -ThreadsPerChild 25 -MaxRequestsPerChild 0 -</IfModule> + +StartServers ${HTTPD_StartServers} +MinSpareServers ${HTTPD_MinSpareServers} +MaxSpareServers ${HTTPD_MaxSpareServers} +ServerLimit ${HTTPD_ServerLimit} +MaxClients ${HTTPD_MaxClients} +MaxRequestsPerChild ${HTTPD_MaxRequestsPerChild} + Listen ${PORT} +User app +Group app + LoadModule authz_host_module modules/mod_authz_host.so -LoadModule include_module modules/mod_include.so LoadModule log_config_module modules/mod_log_config.so -LoadModule logio_module modules/mod_logio.so LoadModule env_module modules/mod_env.so -LoadModule ext_filter_module modules/mod_ext_filter.so LoadModule mime_magic_module modules/mod_mime_magic.so LoadModule expires_module modules/mod_expires.so LoadModule deflate_module modules/mod_deflate.so LoadModule headers_module modules/mod_headers.so -LoadModule usertrack_module modules/mod_usertrack.so LoadModule setenvif_module modules/mod_setenvif.so LoadModule mime_module modules/mod_mime.so -LoadModule dav_module modules/mod_dav.so -LoadModule status_module modules/mod_status.so -LoadModule autoindex_module modules/mod_autoindex.so -LoadModule info_module modules/mod_info.so -LoadModule dav_fs_module modules/mod_dav_fs.so -LoadModule vhost_alias_module modules/mod_vhost_alias.so LoadModule negotiation_module modules/mod_negotiation.so LoadModule dir_module modules/mod_dir.so -LoadModule actions_module modules/mod_actions.so -LoadModule speling_module modules/mod_speling.so LoadModule alias_module modules/mod_alias.so -LoadModule substitute_module modules/mod_substitute.so LoadModule rewrite_module modules/mod_rewrite.so -LoadModule cache_module modules/mod_cache.so -LoadModule disk_cache_module modules/mod_disk_cache.so -LoadModule version_module modules/mod_version.so LoadModule perl_module modules/mod_perl.so -User app -Group app -ServerAdmin root@localhost + UseCanonicalName Off <Directory /> Options FollowSymLinks @@ -68,9 +48,7 @@ AccessFileName .htaccess </Files> TypesConfig /etc/mime.types DefaultType text/plain -<IfModule mod_mime_magic.c> - MIMEMagicFile conf/magic -</IfModule> +MIMEMagicFile conf/magic HostnameLookups Off ErrorLog /dev/stderr LogLevel warn @@ -80,10 +58,6 @@ LogFormat "%{Referer}i -> %U" referer LogFormat "%{User-agent}i" agent ServerSignature Off AddDefaultCharset UTF-8 -AddType application/x-compress .Z -AddType application/x-gzip .gz .tgz -AddType application/x-x509-ca-cert .crt -AddType application/x-pkcs7-crl .crl PerlSwitches -wT PerlRequire /app/mod_perl.pl |