Bug 12904: Apache configuration

[koha-ffzg.git] / debian / templates / apache-site.conf.in

diff --git a/debian/templates/apache-site.conf.in b/debian/templates/apache-site.conf.in
index e9dbf93..654674d 100644 (file)
--- a/debian/templates/apache-site.conf.in
+++ b/debian/templates/apache-site.conf.in
@@ -2,8 +2,12 @@
 
 # OPAC
 <VirtualHost *:__OPACPORT__>
+  <IfVersion >= 2.4>
+   Define instance "__KOHASITE__"
+  </IfVersion>
    Include /etc/koha/apache-shared.conf
 #  Include /etc/koha/apache-shared-disable.conf
+#  Include /etc/koha/apache-shared-opac-plack.conf
    Include /etc/koha/apache-shared-opac.conf
 
    ServerName __OPACSERVER__
@@ -11,21 +15,25 @@
    AssignUserID __UNIXUSER__ __UNIXGROUP__
 
    ErrorLog    /var/log/koha/__KOHASITE__/opac-error.log
-#  TransferLog /var/log/koha/__KOHASITE__/opac-access_log
+#  TransferLog /var/log/koha/__KOHASITE__/opac-access.log
 #  RewriteLog  /var/log/koha/__KOHASITE__/opac-rewrite.log
 </VirtualHost>
 
 # Intranet
 <VirtualHost *:__INTRAPORT__>
+  <IfVersion >= 2.4>
+   Define instance "__KOHASITE__"
+  </IfVersion>
    Include /etc/koha/apache-shared.conf
 #  Include /etc/koha/apache-shared-disable.conf
+#  Include /etc/koha/apache-shared-intranet-plack.conf
    Include /etc/koha/apache-shared-intranet.conf
-   
+
    ServerName __INTRASERVER__
    SetEnv KOHA_CONF "/etc/koha/sites/__KOHASITE__/koha-conf.xml"
    AssignUserID __UNIXUSER__ __UNIXGROUP__
 
    ErrorLog    /var/log/koha/__KOHASITE__/intranet-error.log
-#  TransferLog /var/log/koha/__KOHASITE__/intranet-access_log
+#  TransferLog /var/log/koha/__KOHASITE__/intranet-access.log
 #  RewriteLog  /var/log/koha/__KOHASITE__/intranet-rewrite.log
 </VirtualHost>