View | Details | Raw Unified | Return to bug 17332
Collapse All | Expand All

(-)a/debian/templates/apache-site-https.conf.in (-4 lines)
Lines 30-37 Link Here
30
30
31
   ServerName __OPACSERVER__
31
   ServerName __OPACSERVER__
32
   SetEnv KOHA_CONF "/etc/koha/sites/__KOHASITE__/koha-conf.xml"
32
   SetEnv KOHA_CONF "/etc/koha/sites/__KOHASITE__/koha-conf.xml"
33
   SetEnv MEMCACHED_SERVERS "__MEMCACHED_SERVERS__"
34
   SetEnv MEMCACHED_NAMESPACE "__MEMCACHED_NAMESPACE__"
35
   AssignUserID __UNIXUSER__ __UNIXGROUP__
33
   AssignUserID __UNIXUSER__ __UNIXGROUP__
36
34
37
   ErrorLog    /var/log/koha/__KOHASITE__/opac-error.log
35
   ErrorLog    /var/log/koha/__KOHASITE__/opac-error.log
Lines 60-67 Link Here
60
58
61
   ServerName __INTRASERVER__
59
   ServerName __INTRASERVER__
62
   SetEnv KOHA_CONF "/etc/koha/sites/__KOHASITE__/koha-conf.xml"
60
   SetEnv KOHA_CONF "/etc/koha/sites/__KOHASITE__/koha-conf.xml"
63
   SetEnv MEMCACHED_SERVERS "__MEMCACHED_SERVERS__"
64
   SetEnv MEMCACHED_NAMESPACE "__MEMCACHED_NAMESPACE__"
65
   AssignUserID __UNIXUSER__ __UNIXGROUP__
61
   AssignUserID __UNIXUSER__ __UNIXGROUP__
66
62
67
   ErrorLog    /var/log/koha/__KOHASITE__/intranet-error.log
63
   ErrorLog    /var/log/koha/__KOHASITE__/intranet-error.log
(-)a/debian/templates/apache-site.conf.in (-5 / +1 lines)
Lines 12-19 Link Here
12
12
13
   ServerName __OPACSERVER__
13
   ServerName __OPACSERVER__
14
   SetEnv KOHA_CONF "/etc/koha/sites/__KOHASITE__/koha-conf.xml"
14
   SetEnv KOHA_CONF "/etc/koha/sites/__KOHASITE__/koha-conf.xml"
15
   SetEnv MEMCACHED_SERVERS "__MEMCACHED_SERVERS__"
16
   SetEnv MEMCACHED_NAMESPACE "__MEMCACHED_NAMESPACE__"
17
   AssignUserID __UNIXUSER__ __UNIXGROUP__
15
   AssignUserID __UNIXUSER__ __UNIXGROUP__
18
16
19
   ErrorLog    /var/log/koha/__KOHASITE__/opac-error.log
17
   ErrorLog    /var/log/koha/__KOHASITE__/opac-error.log
Lines 30-40 Link Here
30
#  Include /etc/koha/apache-shared-disable.conf
28
#  Include /etc/koha/apache-shared-disable.conf
31
#  Include /etc/koha/apache-shared-intranet-plack.conf
29
#  Include /etc/koha/apache-shared-intranet-plack.conf
32
   Include /etc/koha/apache-shared-intranet.conf
30
   Include /etc/koha/apache-shared-intranet.conf
33
   
31
34
   ServerName __INTRASERVER__
32
   ServerName __INTRASERVER__
35
   SetEnv KOHA_CONF "/etc/koha/sites/__KOHASITE__/koha-conf.xml"
33
   SetEnv KOHA_CONF "/etc/koha/sites/__KOHASITE__/koha-conf.xml"
36
   SetEnv MEMCACHED_SERVERS "__MEMCACHED_SERVERS__"
37
   SetEnv MEMCACHED_NAMESPACE "__MEMCACHED_NAMESPACE__"
38
   AssignUserID __UNIXUSER__ __UNIXGROUP__
34
   AssignUserID __UNIXUSER__ __UNIXGROUP__
39
35
40
   ErrorLog    /var/log/koha/__KOHASITE__/intranet-error.log
36
   ErrorLog    /var/log/koha/__KOHASITE__/intranet-error.log
(-)a/etc/koha-httpd.conf (-5 lines)
Lines 17-24 Link Here
17
#  TransferLog __LOG_DIR__/koha-opac-access.log
17
#  TransferLog __LOG_DIR__/koha-opac-access.log
18
   SetEnv KOHA_CONF "__KOHA_CONF_DIR__/koha-conf.xml"
18
   SetEnv KOHA_CONF "__KOHA_CONF_DIR__/koha-conf.xml"
19
   SetEnv PERL5LIB "__PERL_MODULE_DIR__"
19
   SetEnv PERL5LIB "__PERL_MODULE_DIR__"
20
   SetEnv MEMCACHED_SERVERS "__MEMCACHED_SERVERS__"
21
   SetEnv MEMCACHED_NAMESPACE "__MEMCACHED_NAMESPACE__"
22
20
23
   # This syntax allows you to override a system preference
21
   # This syntax allows you to override a system preference
24
   # for a given virtual host. Use with caution!
22
   # for a given virtual host. Use with caution!
Lines 145-152 Link Here
145
#  TransferLog __LOG_DIR__/koha-access.log
143
#  TransferLog __LOG_DIR__/koha-access.log
146
   SetEnv KOHA_CONF "__KOHA_CONF_DIR__/koha-conf.xml"
144
   SetEnv KOHA_CONF "__KOHA_CONF_DIR__/koha-conf.xml"
147
   SetEnv PERL5LIB "__PERL_MODULE_DIR__"
145
   SetEnv PERL5LIB "__PERL_MODULE_DIR__"
148
   SetEnv MEMCACHED_SERVERS "__MEMCACHED_SERVERS__"
149
   SetEnv MEMCACHED_NAMESPACE "__MEMCACHED_NAMESPACE__"
150
   Options +FollowSymLinks
146
   Options +FollowSymLinks
151
147
152
   # If you are overriding any system preferences,
148
   # If you are overriding any system preferences,
153
- 

Return to bug 17332