From: Casey Bodley <cbodley@redhat.com>
Date: Mon, 15 May 2017 22:08:07 +0000 (-0400)
Subject: rgw: remove fastcgi from default rgw frontends
X-Git-Tag: v12.1.0~10^2~18^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=47c949d6c007748fb6ab2d70bb50d24cd30a6b14;p=ceph.git

rgw: remove fastcgi from default rgw frontends

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 405aeacf6d8f..b8ae97dbc22c 100644
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -1632,7 +1632,7 @@ OPTION(rgw_bucket_default_quota_max_size, OPT_LONGLONG, -1) // Max size of objec
 
 OPTION(rgw_expose_bucket, OPT_BOOL, false) // Return the bucket name in the 'Bucket' response header
 
-OPTION(rgw_frontends, OPT_STR, "fastcgi, civetweb port=7480") // rgw front ends
+OPTION(rgw_frontends, OPT_STR, "civetweb port=7480") // rgw front ends
 
 OPTION(rgw_user_quota_bucket_sync_interval, OPT_INT, 180) // time period for accumulating modified buckets before syncing stats
 OPTION(rgw_user_quota_sync_interval, OPT_INT, 3600 * 24) // time period for accumulating modified buckets before syncing entire user stats
diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
index 01ef5556c221..f018faba8d62 100644
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@ -232,7 +232,7 @@ int main(int argc, const char **argv)
   multimap<string, RGWFrontendConfig *> fe_map;
   list<RGWFrontendConfig *> configs;
   if (frontends.empty()) {
-    frontends.push_back("fastcgi");
+    frontends.push_back("civetweb");
   }
   for (list<string>::iterator iter = frontends.begin(); iter != frontends.end(); ++iter) {
     string& f = *iter;