]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
apache: switch to use the apache worker mpm
authorYehuda Sadeh <yehuda@redhat.com>
Wed, 22 Oct 2014 21:40:07 +0000 (14:40 -0700)
committerYehuda Sadeh <yehuda@redhat.com>
Wed, 22 Oct 2014 22:12:56 +0000 (15:12 -0700)
Fixes: #9169
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
tasks/rgw.py

index 850bc82c3cc08d435031d662013cfabe452dd80d..0fe1dc0918e3f5f86e06f9a451346921067cf7a1 100644 (file)
@@ -271,7 +271,17 @@ def start_apache(ctx, config):
         if system_type == 'deb':
             apache_name = 'apache2'
         else:
-            apache_name = '/usr/sbin/httpd'
+            try:
+                remote.run(
+                    args=[
+                        'stat',
+                        '/usr/sbin/httpd.worker',
+                    ],
+                )
+                apache_name = '/usr/sbin/httpd.worker'
+            except CommandFailedError:
+                apache_name = '/usr/sbin/httpd'
+
         proc = remote.run(
             args=[
                 'adjust-ulimits',