diff --git a/PandaPkgInfo.py b/PandaPkgInfo.py index 96f4d16ed..f8003d934 100644 --- a/PandaPkgInfo.py +++ b/PandaPkgInfo.py @@ -1 +1 @@ -release_version = "0.0.68" +release_version = "0.0.69" diff --git a/templates/panda_server-httpd-FastCGI.conf.rpmnew.template b/templates/panda_server-httpd-FastCGI.conf.rpmnew.template index 5afc454a2..fecc55b7d 100644 --- a/templates/panda_server-httpd-FastCGI.conf.rpmnew.template +++ b/templates/panda_server-httpd-FastCGI.conf.rpmnew.template @@ -19,6 +19,15 @@ MaxClients ${PANDA_SERVER_CONF_MAX_WORKERS} MaxRequestsPerChild 2000 + +StartServers ${PANDA_SERVER_CONF_MIN_WORKERS} +MinSpareThreads ${PANDA_SERVER_CONF_MIN_WORKERS} +ServerLimit ${PANDA_SERVER_CONF_MAX_WORKERS} +MaxSpareThreads ${PANDA_SERVER_CONF_MAX_WORKERS} +MaxRequestWorkers ${PANDA_SERVER_CONF_MAX_WORKERS} +MaxConnectionsPerChild 2000 + + ServerName ${PANDA_SERVER_CONF_SERVERNAME} DocumentRoot "@@install_purelib@@/pandaserver" @@ -67,21 +76,6 @@ Alias /auth/ "/opt/panda/etc/panda/auth/" Header set Content-Encoding gzip - - FastCgiIpcDir /var/log/panda/fastsocks - FastCgiServer /pandaserver/server/panda.py \ - -processes 25 -idle-timeout 300 -listen-queue-depth 1 -flush \ - -initial-env PYTHONPATH \ - -initial-env TZ \ - -initial-env HOME \ - -initial-env PANDA_HOME \ - -initial-env X509_CERT_DIR \ - -initial-env X509_USER_PROXY \ - -initial-env PANDA_URL \ - -initial-env PANDA_URL_SSL - ScriptAliasMatch ^/server/panda/(.+)$ @@install_purelib@@/pandaserver/server/panda.py - - WSGIPythonHome /opt/panda WSGIDaemonProcess pandasrv_daemon processes=${PANDA_SERVER_CONF_NUM_WSGI} threads=1 home=/home/atlpan @@ -99,8 +93,6 @@ Listen ${PANDA_SERVER_CONF_PORT} RewriteEngine on RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK) RewriteRule .* - [F] -# use Cassandra for cache -RewriteRule ^/cscache/(.*)$ /server/panda/getFile?fileName=$1 [PT,L] @@ -135,8 +127,6 @@ Listen ${PANDA_SERVER_CONF_PORT_SSL} RewriteEngine on RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK) RewriteRule .* - [F] -# use Cassandra for cache -RewriteRule ^/cscache/(.*)$ /server/panda/getFile?fileName=$1 [PT,L] # CERN security recommendation to only allow the seven strongest ssl ciphers SSLProtocol all -SSLv2 -SSLv3 -TLSv1 -TLSv1.1