From: Yehuda Sadeh <yehuda@inktank.com>
Date: Wed, 26 Mar 2014 23:06:29 +0000 (-0700)
Subject: rgw: idle timeout config moves to the external server line
X-Git-Tag: 1.1.0~1557
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b6ad5c6ce216dbbcad2d31b11d4147cb63c8add1;p=teuthology.git

rgw: idle timeout config moves to the external server line

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
---

diff --git a/teuthology/task/apache.conf.template b/teuthology/task/apache.conf.template
index 100ed4e79..c6fc6620e 100644
--- a/teuthology/task/apache.conf.template
+++ b/teuthology/task/apache.conf.template
@@ -21,8 +21,7 @@ CustomLog {testdir}/archive/apache.{client}/access.log combined
 PidFile {testdir}/apache/tmp.{client}/apache.pid
 DocumentRoot {testdir}/apache/htdocs.{client}
 FastCgiIPCDir {testdir}/apache/tmp.{client}/fastcgi_sock
-FastCgiExternalServer {testdir}/apache/htdocs.{client}/rgw.fcgi -socket rgw_sock
-FastCgiConfig -idle-timeout {idle_timeout}
+FastCgiExternalServer {testdir}/apache/htdocs.{client}/rgw.fcgi -socket rgw_sock -idle-timeout {idle_timeout}
 RewriteEngine On
 
 RewriteRule ^/([a-zA-Z0-9-_.]*)([/]?.*) /rgw.fcgi?page=$1&params=$2&%{{QUERY_STRING}} [E=HTTP_AUTHORIZATION:%{{HTTP:Authorization}},L]