Attachment #50477 for bug #16222

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

Lines 260-266 my $target_map = { Link Here

(-)a/Makefile.PL (-1 / +5 lines)
260	'./about.pl' => 'INTRANET_CGI_DIR',	260	'./about.pl' => 'INTRANET_CGI_DIR',
261	'./acqui' => 'INTRANET_CGI_DIR',	261	'./acqui' => 'INTRANET_CGI_DIR',
262	'./admin' => 'INTRANET_CGI_DIR',	262	'./admin' => 'INTRANET_CGI_DIR',
263	'./api' => 'INTRANET_CGI_DIR',	263	'./api' => 'API_CGI_DIR',
264	'./authorities' => 'INTRANET_CGI_DIR',	264	'./authorities' => 'INTRANET_CGI_DIR',
265	'./basket' => 'INTRANET_CGI_DIR',	265	'./basket' => 'INTRANET_CGI_DIR',
266	'./C4' => 'PERL_MODULE_DIR',	266	'./C4' => 'PERL_MODULE_DIR',
Lines 1219-1224 sub get_target_directories { Link Here
1219	my %dirmap = ();	1219	my %dirmap = ();
1220	my %skipdirs = ();	1220	my %skipdirs = ();
1221	if ($mode eq 'single') {	1221	if ($mode eq 'single') {
		1222	$dirmap{'API_CGI_DIR'} = File::Spec->catdir(@basedir, $package, 'api');
1222	$dirmap{'INTRANET_CGI_DIR'} = File::Spec->catdir(@basedir, $package, 'intranet', 'cgi-bin');	1223	$dirmap{'INTRANET_CGI_DIR'} = File::Spec->catdir(@basedir, $package, 'intranet', 'cgi-bin');
1223	$dirmap{'INTRANET_TMPL_DIR'} = File::Spec->catdir(@basedir, $package, 'intranet', 'htdocs', 'intranet-tmpl');	1224	$dirmap{'INTRANET_TMPL_DIR'} = File::Spec->catdir(@basedir, $package, 'intranet', 'htdocs', 'intranet-tmpl');
1224	$dirmap{'INTRANET_WWW_DIR'} = File::Spec->catdir(@basedir, $package, 'intranet', 'htdocs');	1225	$dirmap{'INTRANET_WWW_DIR'} = File::Spec->catdir(@basedir, $package, 'intranet', 'htdocs');
Lines 1242-1247 sub get_target_directories { Link Here
1242	$dirmap{'ZEBRA_RUN_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'run', 'zebradb');	1243	$dirmap{'ZEBRA_RUN_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'run', 'zebradb');
1243	} elsif ($mode eq 'dev') {	1244	} elsif ($mode eq 'dev') {
1244	my $curdir = File::Spec->rel2abs(File::Spec->curdir());	1245	my $curdir = File::Spec->rel2abs(File::Spec->curdir());
		1246	$dirmap{'API_CGI_DIR'} = File::Spec->catdir($curdir, 'api');
		1247	$skipdirs{'API_CGI_DIR'} = 1;
1245	$dirmap{'INTRANET_CGI_DIR'} = File::Spec->catdir($curdir);	1248	$dirmap{'INTRANET_CGI_DIR'} = File::Spec->catdir($curdir);
1246	$skipdirs{'INTRANET_CGI_DIR'} = 1;	1249	$skipdirs{'INTRANET_CGI_DIR'} = 1;
1247	$dirmap{'INTRANET_TMPL_DIR'} = File::Spec->catdir($curdir, 'koha-tmpl', 'intranet-tmpl');	1250	$dirmap{'INTRANET_TMPL_DIR'} = File::Spec->catdir($curdir, 'koha-tmpl', 'intranet-tmpl');
Lines 1275-1280 sub get_target_directories { Link Here
1275	$dirmap{'ZEBRA_RUN_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'run', 'zebradb');	1278	$dirmap{'ZEBRA_RUN_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'run', 'zebradb');
1276	} else {	1279	} else {
1277	# mode is standard, i.e., 'fhs'	1280	# mode is standard, i.e., 'fhs'
		1281	$dirmap{'API_CGI_DIR'} = File::Spec->catdir(@basedir, $package, 'api');
1278	$dirmap{'INTRANET_CGI_DIR'} = File::Spec->catdir(@basedir, $package, 'intranet', 'cgi-bin');	1282	$dirmap{'INTRANET_CGI_DIR'} = File::Spec->catdir(@basedir, $package, 'intranet', 'cgi-bin');
1279	$dirmap{'INTRANET_TMPL_DIR'} = File::Spec->catdir(@basedir, $package, 'intranet', 'htdocs', 'intranet-tmpl');	1283	$dirmap{'INTRANET_TMPL_DIR'} = File::Spec->catdir(@basedir, $package, 'intranet', 'htdocs', 'intranet-tmpl');
1280	$dirmap{'INTRANET_WWW_DIR'} = File::Spec->catdir(@basedir, $package, 'intranet', 'htdocs');	1284	$dirmap{'INTRANET_WWW_DIR'} = File::Spec->catdir(@basedir, $package, 'intranet', 'htdocs');




     RewriteRule ^/issn/([^\/]*)/?$ /search?q=issn:$1 [PT]

     # REST API configuration
     Alias "/api" "__API_CGI_DIR__"
     <Directory __API_CGI_DIR__>
       Options +ExecCGI +FollowSymlinks
       AddHandler cgi-script .pl




     # REST API configuration
     Alias "/api" "__API_CGI_DIR__"
     <Directory __API_CGI_DIR__>
       Options +ExecCGI +FollowSymlinks
       AddHandler cgi-script .pl


#  ErrorLog __LOG_DIR__/koha-api-error_log
#
#  <IfModule mod_rewrite.c>
#    <Directory __API_CGI_DIR__>
#      Options +ExecCGI +FollowSymlinks
#      AddHandler cgi-script .pl
#

Lines 103-108 $prefix = $ENV{'INSTALL_BASE'} \|\| "/usr"; Link Here

(-)a/rewrite-config.PL (-1 / +1 lines)
103	"__ZEBRA_PASS__" => "zebrastripes",	103	"__ZEBRA_PASS__" => "zebrastripes",
104	"__ZEBRA_USER__" => "kohauser",	104	"__ZEBRA_USER__" => "kohauser",
105	'__BACKUP_DIR__' => "$prefix/var/spool",	105	'__BACKUP_DIR__' => "$prefix/var/spool",
		106	'__API_CGI_DIR__' => "$prefix/api",
106	'__INTRANET_CGI_DIR__' => "$prefix/intranet/cgi-bin",	107	'__INTRANET_CGI_DIR__' => "$prefix/intranet/cgi-bin",
107	'__INTRANET_TMPL_DIR__' => "$prefix/intranet/templates",	108	'__INTRANET_TMPL_DIR__' => "$prefix/intranet/templates",
108	'__INTRANET_WWW_DIR__' => "$prefix/intranet/www",	109	'__INTRANET_WWW_DIR__' => "$prefix/intranet/www",
109	-

Return to bug 16222

Lines 114-121 Link Here

(-)a/etc/koha-httpd.conf (-5 / +5 lines)
114	RewriteRule ^/issn/([^\/]*)/?$ /search?q=issn:$1 [PT]	114	RewriteRule ^/issn/([^\/]*)/?$ /search?q=issn:$1 [PT]
115		115
116	# REST API configuration	116	# REST API configuration
117	Alias "/api" "__OPAC_CGI_DIR__/api"	117	Alias "/api" "__API_CGI_DIR__"
118	<Directory __OPAC_CGI_DIR__/api>	118	<Directory __API_CGI_DIR__>
119	Options +ExecCGI +FollowSymlinks	119	Options +ExecCGI +FollowSymlinks
120	AddHandler cgi-script .pl	120	AddHandler cgi-script .pl
121		121
Lines 233-240 Link Here
233		233
234		234
235	# REST API configuration	235	# REST API configuration
236	Alias "/api" "__INTRANET_CGI_DIR__/api"	236	Alias "/api" "__API_CGI_DIR__"
237	<Directory __INTRANET_CGI_DIR__/api>	237	<Directory __API_CGI_DIR__>
238	Options +ExecCGI +FollowSymlinks	238	Options +ExecCGI +FollowSymlinks
239	AddHandler cgi-script .pl	239	AddHandler cgi-script .pl
240		240
Lines 261-267 Link Here
261	# ErrorLog __LOG_DIR__/koha-api-error_log	261	# ErrorLog __LOG_DIR__/koha-api-error_log
262	#	262	#
263	# <IfModule mod_rewrite.c>	263	# <IfModule mod_rewrite.c>
264	# <Directory __INTRANET_CGI_DIR__/api>	264	# <Directory __API_CGI_DIR__>
265	# Options +ExecCGI +FollowSymlinks	265	# Options +ExecCGI +FollowSymlinks
266	# AddHandler cgi-script .pl	266	# AddHandler cgi-script .pl
267	#	267	#