X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=debian%2Ftemplates%2Fapache-site.conf.in;h=654674d5d73a971f257649b24d52e3427db2ebb5;hb=43c67312a02c60f77f8a164b3766dbcbd8196554;hp=e9dbf935bfc3d5416aee8c4774045ffd872da921;hpb=626c1dcb3ac7e14caee50d3084e2aad2b2c353df;p=koha-ffzg.git diff --git a/debian/templates/apache-site.conf.in b/debian/templates/apache-site.conf.in index e9dbf935bf..654674d5d7 100644 --- a/debian/templates/apache-site.conf.in +++ b/debian/templates/apache-site.conf.in @@ -2,8 +2,12 @@ # OPAC + = 2.4> + Define instance "__KOHASITE__" + 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 # Intranet + = 2.4> + Define instance "__KOHASITE__" + 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