From 07780b06aa7b0fe049cc412309cf87e7fb10a0ef Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 30 Apr 2015 14:25:29 +0200
Subject: Implement module configuration with an option list

---
 etc/httpd.conf | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

(limited to 'etc/httpd.conf')

diff --git a/etc/httpd.conf b/etc/httpd.conf
index 95b887d..b52b7d0 100644
--- a/etc/httpd.conf
+++ b/etc/httpd.conf
@@ -1,13 +1,20 @@
+Listen       ${PORT}
+ServerName  "${SERVER_NAME}"
+ServerAdmin "${ADMIN_EMAIL}"
+
 User apache
 Group apache
 
-ErrorLog error_log
-#ErrorLog "|/usr/sbin/rotatelogs /Users/karen/projects/brep/var/error_log.%Y%m%d 86400"
+DocumentRoot      "${WWW_DIR}/htdocs"
+CoreDumpDirectory "${WORKSPACE_DIR}"
+PidFile           "${WORKSPACE_DIR}/httpd.pid"
 
+#ErrorLog error_log
+ErrorLog "|/usr/sbin/rotatelogs error_log.%Y%m%d 86400"
 ErrorLogFormat "[%t] [%l] [%m] %M"
+LogLevel ${LOG_LEVEL}
 
 Timeout 60
-
 KeepAlive On
 KeepAliveTimeout 3
 
@@ -33,7 +40,21 @@ LoadModule authz_host_module /usr/lib64/httpd/modules/mod_authz_host.so
 LoadModule expires_module /usr/lib64/httpd/modules/mod_expires.so
 LoadModule dir_module /usr/lib64/httpd/modules/mod_dir.so
 
-TypesConfig /etc/mime.types
+LoadModule search_srv ${MODULE_DIR}/libbrep.so
+
+<IfModule search_srv>
+  search-db-host ${DB_HOST}
+  search-db-port ${DB_PORT}
+  search-conf "${CONFIG_DIR}/search.conf"
+</IfModule>
+
+LoadModule view_srv ${MODULE_DIR}/libbrep.so
+
+<IfModule view_srv>
+  view-db-host ${DB_HOST}
+  view-db-port ${DB_PORT}
+  view-conf "${CONFIG_DIR}/view.conf"
+</IfModule>
 
 <LocationMatch ^/search$>
   SetHandler search
@@ -43,8 +64,6 @@ TypesConfig /etc/mime.types
   SetHandler view
 </LocationMatch>
 
-DirectoryIndex index.html
-
 ExtendedStatus On
 
 <Location /server-status>
@@ -59,3 +78,6 @@ ExtendedStatus On
   Options FollowSymLinks
   AllowOverride None
 </Directory>
+
+DirectoryIndex index.html
+TypesConfig /etc/mime.types
-- 
cgit v1.1