From 2fda89944fa528e05c9f6b4fdcd684f2606582a8 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 1 Jun 2015 15:17:07 +0200
Subject: Create brep services controlling scripts

---
 etc/httpd.conf | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'etc/httpd.conf')

diff --git a/etc/httpd.conf b/etc/httpd.conf
index b52b7d0..bf64517 100644
--- a/etc/httpd.conf
+++ b/etc/httpd.conf
@@ -1,18 +1,18 @@
-Listen       ${PORT}
-ServerName  "${SERVER_NAME}"
-ServerAdmin "${ADMIN_EMAIL}"
+Listen       ${AP_PORT}
+ServerName  "${AP_SERVER_NAME}"
+ServerAdmin "${AP_ADMIN_EMAIL}"
 
 User apache
 Group apache
 
-DocumentRoot      "${WWW_DIR}/htdocs"
-CoreDumpDirectory "${WORKSPACE_DIR}"
-PidFile           "${WORKSPACE_DIR}/httpd.pid"
+DocumentRoot      "${AP_WWW_DIR}/htdocs"
+CoreDumpDirectory "${AP_WORKSPACE_DIR}"
+PidFile           "${AP_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}
+LogLevel ${AP_LOG_LEVEL}
 
 Timeout 60
 KeepAlive On
@@ -40,20 +40,20 @@ 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
 
-LoadModule search_srv ${MODULE_DIR}/libbrep.so
+LoadModule search_srv ${AP_MODULE_DIR}/libbrep.so
 
 <IfModule search_srv>
-  search-db-host ${DB_HOST}
-  search-db-port ${DB_PORT}
-  search-conf "${CONFIG_DIR}/search.conf"
+  search-db-host ${AP_DB_HOST}
+  search-db-port ${AP_DB_PORT}
+  search-conf "${AP_CONFIG_DIR}/search.conf"
 </IfModule>
 
-LoadModule view_srv ${MODULE_DIR}/libbrep.so
+LoadModule view_srv ${AP_MODULE_DIR}/libbrep.so
 
 <IfModule view_srv>
-  view-db-host ${DB_HOST}
-  view-db-port ${DB_PORT}
-  view-conf "${CONFIG_DIR}/view.conf"
+  view-db-host ${AP_DB_HOST}
+  view-db-port ${AP_DB_PORT}
+  view-conf "${AP_CONFIG_DIR}/view.conf"
 </IfModule>
 
 <LocationMatch ^/search$>
-- 
cgit v1.1