installer (part 2): more work

[koha.git] / etc / koha-httpd.conf

diff --git a/etc/koha-httpd.conf b/etc/koha-httpd.conf
index 24d147c..bd88b1d 100644 (file)
--- a/etc/koha-httpd.conf
+++ b/etc/koha-httpd.conf
@@ -5,16 +5,17 @@
 ## OPAC
 <VirtualHost __WEBSERVER_IP__:__WEBSERVER_PORT__>
    ServerAdmin  __WEBMASTER_EMAIL__
-   DocumentRoot __BASE_DIR__/templates/koha-tmpl/
+   DocumentRoot __OPAC_WWW_DIR__
    ServerName __WEBSERVER_HOST__
 #  ServerAlias opac.mydomain.com
-   ScriptAlias /cgi-bin/koha/ "__CGI_DIR__/opac/"
-   ScriptAlias /index.html "__CGI_DIR__/opac/opac-main.pl"
-   ScriptAlias /opac-search.pl "__CGI_DIR__/opac/search"
-   ScriptAlias /search "__CGI_DIR__/opac/search"
+   ScriptAlias /cgi-bin/koha/ "__OPAC_CGI_DIR__/opac/"
+   ScriptAlias /index.html "__OPAC_CGI_DIR__/opac/opac-main.pl"
+   ScriptAlias /opac-search.pl "__OPAC_CGI_DIR__/opac/search"
+   ScriptAlias /search "__OPAC_CGI_DIR__/opac/search"
    ErrorLog __LOG_DIR__/koha-opac-error_log
 #  TransferLog __LOG_DIR__/koha-opac-access_log
-   SetEnv KOHA_CONF "__PREFIX__/share/koha/etc/koha-conf.xml"
+   SetEnv KOHA_CONF "__KOHA_CONF_DIR__/koha-conf.xml"
+   SetEnv PERL5LIB "__PERL_MODULE_DIR__"
    Options +FollowSymLinks
 
 #  Rewrite Rules
@@ -34,15 +35,16 @@
 ## Intranet
 <VirtualHost __WEBSERVER_IP__:__WEBSERVER_PORT_LIBRARIAN__>
    ServerAdmin __WEBMASTER_EMAIL__
-   DocumentRoot __BASE_DIR__/templates/koha-tmpl/
+   DocumentRoot __INTRANET_WWW_DIR__
    ServerName __WEBSERVER_HOST__:__WEBSERVER_PORT_LIBRARIAN__
 #  ServerAlias intranet.mydomain.com
-   ScriptAlias /cgi-bin/koha/ "__CGI_DIR__/koha/"
-   ScriptAlias /index.html "__CGI_DIR__/koha/mainpage.pl"
-   ScriptAlias /search "__CGI_DIR__/koha/search.pl"
+   ScriptAlias /cgi-bin/koha/ "__INTRANET_CGI_DIR__"
+   ScriptAlias /index.html "__INTRANET_CGI_DIR__/mainpage.pl"
+   ScriptAlias /search "__INTRANET_CGI_DIR__/search.pl"
    ErrorLog __LOG_DIR__/koha-error_log
 #  TransferLog __LOG_DIR__/koha-access_log
-   SetEnv KOHA_CONF "__PREFIX__/share/koha/etc/koha-conf.xml"
+   SetEnv KOHA_CONF "__KOHA_CONF_DIR__/koha-conf.xml"
+   SetEnv PERL5LIB "__PERL_MODULE_DIR__"
    Options +FollowSymLinks
    RewriteEngine On    
 #  Uncomment to turn on rewrite logging