From: Yehuda Sadeh <yehuda@inktank.com>
Date: Sat, 20 Jul 2013 18:30:24 +0000 (-0700)
Subject: apache.conf: load modules conditionally
X-Git-Tag: 1.1.0~2062
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=37a662442d7d73eb319f4c26c14d6045d6a39398;p=teuthology.git

apache.conf: load modules conditionally

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

diff --git a/teuthology/task/apache.conf.template b/teuthology/task/apache.conf.template
index a6083d660b..87e92728a9 100644
--- a/teuthology/task/apache.conf.template
+++ b/teuthology/task/apache.conf.template
@@ -1,7 +1,15 @@
-LoadModule env_module {mod_path}/mod_env.so
-LoadModule rewrite_module {mod_path}/mod_rewrite.so
-LoadModule fastcgi_module {mod_path}/mod_fastcgi.so
-LoadModule log_config_module {mod_path}/mod_log_config.so
+<IfModule !env_module>
+  LoadModule env_module {mod_path}/mod_env.so
+</IfModule>
+<IfModule !rewrite_module>
+  LoadModule rewrite_module {mod_path}/mod_rewrite.so
+</IfModule>
+<IfModule !fastcgi_module>
+  LoadModule fastcgi_module {mod_path}/mod_fastcgi.so
+</IfModule>
+<IfModule !log_config_module>
+  LoadModule log_config_module {mod_path}/mod_log_config.so
+</IfModule>
 
 Listen 7280
 ServerName rgwtest.example.com