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

(-)a/Makefile.PL (+9 lines)
Lines 198-203 HTML templates for the OPAC interface. Link Here
198
198
199
HTML files, images, etc. for DocumentRoot for the OPAC interface.
199
HTML files, images, etc. for DocumentRoot for the OPAC interface.
200
200
201
=item PUBLIC_WWW_DIR
202
203
Public files for WWW interfaces.
204
201
=item PERL_MODULE_DIR
205
=item PERL_MODULE_DIR
202
206
203
Perl modules (at present just the C4 modules) that are intimately
207
Perl modules (at present just the C4 modules) that are intimately
Lines 331-336 my $target_map = { Link Here
331
    './Koha.pm'                                        => 'PERL_MODULE_DIR',
335
    './Koha.pm'                                        => 'PERL_MODULE_DIR',
332
    './koha-tmpl/intranet-tmpl'                        => { target => 'INTRANET_TMPL_DIR', trimdir => -1 },
336
    './koha-tmpl/intranet-tmpl'                        => { target => 'INTRANET_TMPL_DIR', trimdir => -1 },
333
    './koha-tmpl/opac-tmpl'                            => { target => 'OPAC_TMPL_DIR',     trimdir => -1 },
337
    './koha-tmpl/opac-tmpl'                            => { target => 'OPAC_TMPL_DIR',     trimdir => -1 },
338
    './public'                                         => { target => 'PUBLIC_WWW_DIR', trimdir => -1 },
334
    './kohaversion.pl'                                 => 'INTRANET_CGI_DIR',
339
    './kohaversion.pl'                                 => 'INTRANET_CGI_DIR',
335
    './labels'                                         => 'INTRANET_CGI_DIR',
340
    './labels'                                         => 'INTRANET_CGI_DIR',
336
    './lib'                                            => { target => 'PERL_MODULE_LIB_DIR', trimdir => -1 },
341
    './lib'                                            => { target => 'PERL_MODULE_LIB_DIR', trimdir => -1 },
Lines 1458-1463 sub get_target_directories { Link Here
1458
        $dirmap{'OPAC_CGI_DIR'} = File::Spec->catdir(@basedir, $package, 'opac', 'cgi-bin');
1463
        $dirmap{'OPAC_CGI_DIR'} = File::Spec->catdir(@basedir, $package, 'opac', 'cgi-bin');
1459
        $dirmap{'OPAC_TMPL_DIR'} = File::Spec->catdir(@basedir, $package, 'opac', 'htdocs', 'opac-tmpl');
1464
        $dirmap{'OPAC_TMPL_DIR'} = File::Spec->catdir(@basedir, $package, 'opac', 'htdocs', 'opac-tmpl');
1460
        $dirmap{'OPAC_WWW_DIR'} = File::Spec->catdir(@basedir, $package, 'opac', 'htdocs');
1465
        $dirmap{'OPAC_WWW_DIR'} = File::Spec->catdir(@basedir, $package, 'opac', 'htdocs');
1466
        $dirmap{'PUBLIC_WWW_DIR'} = File::Spec->catdir(@basedir, $package, 'public');
1461
        $dirmap{'PERL_MODULE_DIR'} = File::Spec->catdir(@basedir, $package, 'lib');
1467
        $dirmap{'PERL_MODULE_DIR'} = File::Spec->catdir(@basedir, $package, 'lib');
1462
        $dirmap{'PERL_MODULE_LIB_DIR'} = File::Spec->catdir(@basedir, $package, 'lib');
1468
        $dirmap{'PERL_MODULE_LIB_DIR'} = File::Spec->catdir(@basedir, $package, 'lib');
1463
        $dirmap{'KOHA_CONF_DIR'} = File::Spec->catdir(@basedir, $package, 'etc');
1469
        $dirmap{'KOHA_CONF_DIR'} = File::Spec->catdir(@basedir, $package, 'etc');
Lines 1491-1496 sub get_target_directories { Link Here
1491
        $skipdirs{'OPAC_TMPL_DIR'} = 1;
1497
        $skipdirs{'OPAC_TMPL_DIR'} = 1;
1492
        $dirmap{'OPAC_WWW_DIR'} = File::Spec->catdir($curdir, 'koha-tmpl');
1498
        $dirmap{'OPAC_WWW_DIR'} = File::Spec->catdir($curdir, 'koha-tmpl');
1493
        $skipdirs{'OPAC_WWW_DIR'} = 1;
1499
        $skipdirs{'OPAC_WWW_DIR'} = 1;
1500
        $dirmap{'PUBLIC_WWW_DIR'} = File::Spec->catdir($curdir, 'public');
1501
        $skipdirs{'PUBLIC_WWW_DIR'} = 1;
1494
        #NOTE: We're hacking the dirmap here, so that PERL_MODULE_DIR tokens get rewritten correctly for git installs
1502
        #NOTE: We're hacking the dirmap here, so that PERL_MODULE_DIR tokens get rewritten correctly for git installs
1495
        $dirmap{'PERL_MODULE_DIR'} = File::Spec->catdir($curdir);
1503
        $dirmap{'PERL_MODULE_DIR'} = File::Spec->catdir($curdir);
1496
        $skipdirs{'PERL_MODULE_DIR'} = 1;
1504
        $skipdirs{'PERL_MODULE_DIR'} = 1;
Lines 1523-1528 sub get_target_directories { Link Here
1523
        $dirmap{'OPAC_CGI_DIR'} = File::Spec->catdir(@basedir, $package, 'opac', 'cgi-bin');
1531
        $dirmap{'OPAC_CGI_DIR'} = File::Spec->catdir(@basedir, $package, 'opac', 'cgi-bin');
1524
        $dirmap{'OPAC_TMPL_DIR'} = File::Spec->catdir(@basedir, $package, 'opac', 'htdocs', 'opac-tmpl');
1532
        $dirmap{'OPAC_TMPL_DIR'} = File::Spec->catdir(@basedir, $package, 'opac', 'htdocs', 'opac-tmpl');
1525
        $dirmap{'OPAC_WWW_DIR'} = File::Spec->catdir(@basedir, $package, 'opac', 'htdocs');
1533
        $dirmap{'OPAC_WWW_DIR'} = File::Spec->catdir(@basedir, $package, 'opac', 'htdocs');
1534
        $dirmap{'PUBLIC_WWW_DIR'} = File::Spec->catdir(@basedir, $package, 'public');
1526
        $dirmap{'PERL_MODULE_DIR'} = File::Spec->catdir(@basedir, $package, 'lib');
1535
        $dirmap{'PERL_MODULE_DIR'} = File::Spec->catdir(@basedir, $package, 'lib');
1527
        $dirmap{'PERL_MODULE_LIB_DIR'} = File::Spec->catdir(@basedir, $package, 'lib');
1536
        $dirmap{'PERL_MODULE_LIB_DIR'} = File::Spec->catdir(@basedir, $package, 'lib');
1528
        $dirmap{'KOHA_CONF_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'etc', $package);
1537
        $dirmap{'KOHA_CONF_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'etc', $package);
(-)a/debian/templates/apache-shared-intranet.conf (-1 / +2 lines)
Lines 7-12 Link Here
7
7
8
DocumentRoot /usr/share/koha/intranet/htdocs
8
DocumentRoot /usr/share/koha/intranet/htdocs
9
9
10
Alias /shared "/usr/share/koha/public/shared"
10
ScriptAlias /cgi-bin/koha/ "/usr/share/koha/intranet/cgi-bin/"
11
ScriptAlias /cgi-bin/koha/ "/usr/share/koha/intranet/cgi-bin/"
11
ScriptAlias /index.html "/usr/share/koha/intranet/cgi-bin/mainpage.pl"
12
ScriptAlias /index.html "/usr/share/koha/intranet/cgi-bin/mainpage.pl"
12
ScriptAlias /search "/usr/share/koha/intranet/cgi-bin/catalogue/search.pl"
13
ScriptAlias /search "/usr/share/koha/intranet/cgi-bin/catalogue/search.pl"
Lines 18-24 RewriteRule ^/cgi-bin/koha/(C4|debian|docs|etc|installer/data|install_misc|Koha| Link Here
18
RewriteRule ^/bib/([^\/]*)/?$ /cgi-bin/koha/catalogue/detail.pl?biblionumber=$1 [PT]
19
RewriteRule ^/bib/([^\/]*)/?$ /cgi-bin/koha/catalogue/detail.pl?biblionumber=$1 [PT]
19
RewriteRule ^/isbn/([^\/]*)/?$ /search?q=isbn:$1 [PT]
20
RewriteRule ^/isbn/([^\/]*)/?$ /search?q=isbn:$1 [PT]
20
RewriteRule ^/issn/([^\/]*)/?$ /search?q=issn:$1 [PT]
21
RewriteRule ^/issn/([^\/]*)/?$ /search?q=issn:$1 [PT]
21
RewriteRule ^(.*)_[0-9]{2}\.[0-9]{7}\.(js|css)$ $1.$2 [L]
22
RewriteRule ^(.*)_[0-9]{2}\.[0-9]{7}\.(js|css)$ $1.$2 [PT,L]
22
23
23
RewriteRule ^/cgi-bin/koha/erm/.*$ /cgi-bin/koha/erm/erm.pl [PT]
24
RewriteRule ^/cgi-bin/koha/erm/.*$ /cgi-bin/koha/erm/erm.pl [PT]
24
RewriteCond %{REQUEST_URI} !^/cgi-bin/koha/preservation/.*.pl$
25
RewriteCond %{REQUEST_URI} !^/cgi-bin/koha/preservation/.*.pl$
(-)a/debian/templates/apache-shared-opac.conf (-1 / +2 lines)
Lines 7-12 Link Here
7
7
8
DocumentRoot /usr/share/koha/opac/htdocs
8
DocumentRoot /usr/share/koha/opac/htdocs
9
9
10
Alias /shared "/usr/share/koha/public/shared"
10
ScriptAlias /cgi-bin/koha/ "/usr/share/koha/opac/cgi-bin/opac/"
11
ScriptAlias /cgi-bin/koha/ "/usr/share/koha/opac/cgi-bin/opac/"
11
ScriptAlias /index.html "/usr/share/koha/opac/cgi-bin/opac/opac-main.pl"
12
ScriptAlias /index.html "/usr/share/koha/opac/cgi-bin/opac/opac-main.pl"
12
ScriptAlias /search "/usr/share/koha/opac/cgi-bin/opac/opac-search.pl"
13
ScriptAlias /search "/usr/share/koha/opac/cgi-bin/opac/opac-search.pl"
Lines 15-21 ScriptAlias /opac-search.pl "/usr/share/koha/opac/cgi-bin/opac/opac-search.pl" Link Here
15
RewriteRule ^/bib/([^\/]*)/?$ /cgi-bin/koha/opac-detail\.pl?bib=$1 [PT]
16
RewriteRule ^/bib/([^\/]*)/?$ /cgi-bin/koha/opac-detail\.pl?bib=$1 [PT]
16
RewriteRule ^/isbn/([^\/]*)/?$ /search?q=isbn:$1 [PT]
17
RewriteRule ^/isbn/([^\/]*)/?$ /search?q=isbn:$1 [PT]
17
RewriteRule ^/issn/([^\/]*)/?$ /search?q=issn:$1 [PT]
18
RewriteRule ^/issn/([^\/]*)/?$ /search?q=issn:$1 [PT]
18
RewriteRule ^(.*)_[0-9]{2}\.[0-9]{7}\.(js|css)$ $1.$2 [L]
19
RewriteRule ^(.*)_[0-9]{2}\.[0-9]{7}\.(js|css)$ $1.$2 [PT,L]
19
20
20
<IfVersion >= 2.4>
21
<IfVersion >= 2.4>
21
    AliasMatch "^/sitemap(.*)" "/var/lib/koha/${instance}/sitemap/sitemap$1"
22
    AliasMatch "^/sitemap(.*)" "/var/lib/koha/${instance}/sitemap/sitemap$1"
(-)a/etc/koha-httpd.conf (-2 / +7 lines)
Lines 7-12 Link Here
7
   ServerAdmin  __WEBMASTER_EMAIL__
7
   ServerAdmin  __WEBMASTER_EMAIL__
8
   DocumentRoot __OPAC_WWW_DIR__
8
   DocumentRoot __OPAC_WWW_DIR__
9
   ServerName __WEBSERVER_HOST__
9
   ServerName __WEBSERVER_HOST__
10
11
   Alias /shared "__PUBLIC_WWW_DIR__/shared"
10
#  ServerAlias opac.mydomain.com
12
#  ServerAlias opac.mydomain.com
11
   ScriptAlias /cgi-bin/koha/ "__OPAC_CGI_DIR__/opac/"
13
   ScriptAlias /cgi-bin/koha/ "__OPAC_CGI_DIR__/opac/"
12
   ScriptAlias /index.html "__OPAC_CGI_DIR__/opac/opac-main.pl"
14
   ScriptAlias /index.html "__OPAC_CGI_DIR__/opac/opac-main.pl"
Lines 105-111 Link Here
105
     RewriteRule ^/bib/([^\/]*)/?$ /cgi-bin/koha/opac-detail\.pl?bib=$1 [PT]
107
     RewriteRule ^/bib/([^\/]*)/?$ /cgi-bin/koha/opac-detail\.pl?bib=$1 [PT]
106
     RewriteRule ^/isbn/([^\/]*)/?$ /search?q=isbn:$1 [PT]
108
     RewriteRule ^/isbn/([^\/]*)/?$ /search?q=isbn:$1 [PT]
107
     RewriteRule ^/issn/([^\/]*)/?$ /search?q=issn:$1 [PT]
109
     RewriteRule ^/issn/([^\/]*)/?$ /search?q=issn:$1 [PT]
108
     RewriteRule ^(.*)_[0-9]{2}\.[0-9]{7}\.(js|css)$ $1.$2 [L]
110
     RewriteRule ^(.*)_[0-9]{2}\.[0-9]{7}\.(js|css)$ $1.$2 [PT,L]
109
111
110
     RewriteRule ^/cgi-bin/koha/erm/.*$ /cgi-bin/koha/erm/erm.pl [PT]
112
     RewriteRule ^/cgi-bin/koha/erm/.*$ /cgi-bin/koha/erm/erm.pl [PT]
111
     RewriteRule ^/cgi-bin/koha/preservation/.*$ /cgi-bin/koha/preservation/home.pl [PT]
113
     RewriteRule ^/cgi-bin/koha/preservation/.*$ /cgi-bin/koha/preservation/home.pl [PT]
Lines 140-145 Link Here
140
   ServerAdmin __WEBMASTER_EMAIL__
142
   ServerAdmin __WEBMASTER_EMAIL__
141
   DocumentRoot __INTRANET_WWW_DIR__
143
   DocumentRoot __INTRANET_WWW_DIR__
142
   ServerName __WEBSERVER_HOST__:__WEBSERVER_PORT_LIBRARIAN__
144
   ServerName __WEBSERVER_HOST__:__WEBSERVER_PORT_LIBRARIAN__
145
146
   Alias /shared "__PUBLIC_WWW_DIR__/shared"
147
143
#  ServerAlias intranet.mydomain.com
148
#  ServerAlias intranet.mydomain.com
144
   ScriptAlias /cgi-bin/koha/ "__INTRANET_CGI_DIR__/"
149
   ScriptAlias /cgi-bin/koha/ "__INTRANET_CGI_DIR__/"
145
   ScriptAlias /index.html "__INTRANET_CGI_DIR__/mainpage.pl"
150
   ScriptAlias /index.html "__INTRANET_CGI_DIR__/mainpage.pl"
Lines 230-236 Link Here
230
     RewriteRule ^/bib/([^\/]*)/?$ /cgi-bin/koha/catalogue/detail.pl?biblionumber=$1 [PT]
235
     RewriteRule ^/bib/([^\/]*)/?$ /cgi-bin/koha/catalogue/detail.pl?biblionumber=$1 [PT]
231
     RewriteRule ^/isbn/([^\/]*)/?$ /search?q=isbn:$1 [PT]
236
     RewriteRule ^/isbn/([^\/]*)/?$ /search?q=isbn:$1 [PT]
232
     RewriteRule ^/issn/([^\/]*)/?$ /search?q=issn:$1 [PT]
237
     RewriteRule ^/issn/([^\/]*)/?$ /search?q=issn:$1 [PT]
233
     RewriteRule ^(.*)_[0-9]{2}\.[0-9]{7}\.(js|css)$ $1.$2 [L]
238
     RewriteRule ^(.*)_[0-9]{2}\.[0-9]{7}\.(js|css)$ $1.$2 [PT,L]
234
239
235
240
236
     # REST API configuration
241
     # REST API configuration
(-)a/public/shared/.placeholder (+1 lines)
Line 0 Link Here
1
#This is a placeholder
(-)a/rewrite-config.PL (-1 / +1 lines)
Lines 118-123 my %configuration = ( Link Here
118
  '__OPAC_CGI_DIR__' => "$prefix/opac/cgi-bin",
118
  '__OPAC_CGI_DIR__' => "$prefix/opac/cgi-bin",
119
  '__OPAC_TMPL_DIR__' => "$prefix/opac/templates",
119
  '__OPAC_TMPL_DIR__' => "$prefix/opac/templates",
120
  '__OPAC_WWW_DIR__' => "$prefix/opac/www",
120
  '__OPAC_WWW_DIR__' => "$prefix/opac/www",
121
  '__PUBLIC_WWW_DIR__' => "$prefix/public",
121
  '__PERL_MODULE_DIR__' =>  ($ENV{'INSTALLSITELIB'} || sprintf($prefix."/lib/perl5/site_perl/%vd",$^V))."/koha",
122
  '__PERL_MODULE_DIR__' =>  ($ENV{'INSTALLSITELIB'} || sprintf($prefix."/lib/perl5/site_perl/%vd",$^V))."/koha",
122
  '__KOHA_CONF_DIR__' => "$prefix/etc/koha",
123
  '__KOHA_CONF_DIR__' => "$prefix/etc/koha",
123
  '__ZEBRA_CONF_DIR__' => "$prefix/etc/koha/zebradb",
124
  '__ZEBRA_CONF_DIR__' => "$prefix/etc/koha/zebradb",
124
- 

Return to bug 35716