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

(-)a/C4/Installer/PerlDependencies.pm (+20 lines)
Lines 284-289 our $PERL_DEPS = { Link Here
284
        'required' => '1',
284
        'required' => '1',
285
        'min_ver'  => '3.15'
285
        'min_ver'  => '3.15'
286
    },
286
    },
287
    'Starman' => {
288
	'usage' => 'preforking PSGI/PLACK web server',
289
	'required' => '0',
290
	'min_ver' => '0.300'
291
     },
292
    'CGI::Emulate::PSGI' => {
293
	'usage' => 'PLACK',
294
	'required' => '0',
295
	'min_ver' => '0.10'
296
    },
297
    'CGI::Compile' => {
298
	'usage' => 'PLACK CGI Compilation',
299
	'required' => '0',
300
	'min_ver' => '0.15'
301
    },
302
    'Plack::Middleware::Debug' => {
303
	'usage' => 'PLACK Debugging',
304
	'required' => '0',
305
	'min_ver' => '0.1'
306
    }
287
    'Class::Factory::Util' => {
307
    'Class::Factory::Util' => {
288
        'usage'    => 'Core',
308
        'usage'    => 'Core',
289
        'required' => '1',
309
        'required' => '1',
(-)a/Makefile.PL (-2 / +84 lines)
Lines 298-303 my $target_map = { Link Here
298
  './skel'                      => 'NONE',
298
  './skel'                      => 'NONE',
299
  './skel/var/log/koha'         => { target => 'LOG_DIR', trimdir => -1 },
299
  './skel/var/log/koha'         => { target => 'LOG_DIR', trimdir => -1 },
300
  './skel/var/spool/koha'       => { target => 'BACKUP_DIR', trimdir => -1 },
300
  './skel/var/spool/koha'       => { target => 'BACKUP_DIR', trimdir => -1 },
301
  './skel/var/run/koha/plack' => { target => 'PLACK_RUN_DIR', trimdir => -1 },
301
  './skel/var/run/koha/zebradb' => { target => 'ZEBRA_RUN_DIR', trimdir => -1 },
302
  './skel/var/run/koha/zebradb' => { target => 'ZEBRA_RUN_DIR', trimdir => -1 },
302
  './skel/var/lock/koha/zebradb/authorities' => { target => 'ZEBRA_LOCK_DIR', trimdir => 6 },
303
  './skel/var/lock/koha/zebradb/authorities' => { target => 'ZEBRA_LOCK_DIR', trimdir => 6 },
303
  './skel/var/lib/koha/zebradb/authorities/key'  => { target => 'ZEBRA_DATA_DIR', trimdir => 6 },
304
  './skel/var/lib/koha/zebradb/authorities/key'  => { target => 'ZEBRA_DATA_DIR', trimdir => 6 },
Lines 345-350 Koha from a git clone with no fuss). Link Here
345
Directory under which most components will go.  Default
346
Directory under which most components will go.  Default
346
value will vary depending on INSTALL_MODE.
347
value will vary depending on INSTALL_MODE.
347
348
349
=item WEBSERVER
350
351
Type of WebServer ( Apache2 or NGINX).
352
353
=item INTRANET_DNS
354
355
Set the DNS entry for staff client
356
357
=item OPAC_DNS
358
359
Set the DNS entry for OPAC
360
361
=item INTRANET_PORT
362
363
Set the port for the staff client
364
365
=item OPAC_PORT
366
367
Set the port for the OPAC
368
348
=item DB_TYPE
369
=item DB_TYPE
349
370
350
Type of DBMS (e.g., mysql or Pg).
371
Type of DBMS (e.g., mysql or Pg).
Lines 405-410 System group that will own Koha's files. Link Here
405
426
406
# default configuration options
427
# default configuration options
407
my %config_defaults = (
428
my %config_defaults = (
429
  'WEBSERVER'         => 'apache2',
430
  'INTRANET_DNS'      => 'localhost',
431
  'OPAC_DNS'          => 'localhost',
432
  'INTRANET_PORT'     => '8080',
433
  'OPAC_PORT'         => '80',
408
  'DB_TYPE'           => 'mysql',
434
  'DB_TYPE'           => 'mysql',
409
  'DB_HOST'           => 'localhost',
435
  'DB_HOST'           => 'localhost',
410
  'DB_NAME'           => 'koha',
436
  'DB_NAME'           => 'koha',
Lines 464-469 else { Link Here
464
my %valid_config_values = (
490
my %valid_config_values = (
465
  'INSTALL_MODE'  => { 'standard' => 1, 'single' => 1, 'dev' => 1 },
491
  'INSTALL_MODE'  => { 'standard' => 1, 'single' => 1, 'dev' => 1 },
466
  'DB_TYPE' => { 'mysql' => 1, 'Pg' => 1 },
492
  'DB_TYPE' => { 'mysql' => 1, 'Pg' => 1 },
493
  'WEBSERVER' => { 'apache2' => 1, 'nginx' => 1 },
467
  'INSTALL_ZEBRA' => { 'yes' => 1, 'no' => 1 },
494
  'INSTALL_ZEBRA' => { 'yes' => 1, 'no' => 1 },
468
  'INSTALL_SRU' => { 'yes' => 1, 'no' => 1 },
495
  'INSTALL_SRU' => { 'yes' => 1, 'no' => 1 },
469
  'AUTH_INDEX_MODE' => { 'grs1' => 1, 'dom' => 1 },
496
  'AUTH_INDEX_MODE' => { 'grs1' => 1, 'dom' => 1 },
Lines 496-510 get_file_map($target_map, $dirtree, $file_map, $config{'INSTALL_ZEBRA'} eq "yes" Link Here
496
my $pl_files = {
523
my $pl_files = {
497
      'rewrite-config.PL' => [
524
      'rewrite-config.PL' => [
498
         'blib/KOHA_CONF_DIR/koha-conf.xml',
525
         'blib/KOHA_CONF_DIR/koha-conf.xml',
499
         'blib/KOHA_CONF_DIR/koha-httpd.conf',
526
         'blib/KOHA_CONF_DIR/koha-nginx.conf',
500
         'blib/ZEBRA_CONF_DIR/etc/default.idx',
527
         'blib/ZEBRA_CONF_DIR/etc/default.idx',
501
         'blib/MISC_DIR/koha-install-log'
528
         'blib/MISC_DIR/koha-install-log',
502
         ],
529
         ],
503
	  'fix-perl-path.PL' => [	# this script ensures the correct shebang line for the platform installed on...
530
	  'fix-perl-path.PL' => [	# this script ensures the correct shebang line for the platform installed on...
504
		 'blib'
531
		 'blib'
505
		 ],
532
		 ],
506
};
533
};
507
534
535
if ($config{'WEBSERVER'} eq "apache2"){
536
    push @{ $pl_files->{'rewrite-config.PL'} }, (
537
	'blib/KOHA_CONF_DIR/koha-httpd.conf',
538
    );
539
}
540
else {
541
    push @{ $pl_files->{'rewrite-config.PL'} }, (
542
	'blib/SCRIPT_DIR/koha.psgi',
543
	'blib/SCRIPT_DIR/koha-plack.sh',
544
    );
545
}
546
508
if ($config{'INSTALL_ZEBRA'} eq "yes") {
547
if ($config{'INSTALL_ZEBRA'} eq "yes") {
509
    push @{ $pl_files->{'rewrite-config.PL'} }, (
548
    push @{ $pl_files->{'rewrite-config.PL'} }, (
510
        'blib/ZEBRA_CONF_DIR/etc/passwd',
549
        'blib/ZEBRA_CONF_DIR/etc/passwd',
Lines 559-564 my %test_suite_override_dirs = ( Link Here
559
    ZEBRA_LOCK_DIR => ['var', 'lock', 'zebradb'],
598
    ZEBRA_LOCK_DIR => ['var', 'lock', 'zebradb'],
560
    ZEBRA_DATA_DIR => ['var', 'lib', 'zebradb'],
599
    ZEBRA_DATA_DIR => ['var', 'lib', 'zebradb'],
561
    ZEBRA_RUN_DIR  => ['var', 'run', 'zebradb'],
600
    ZEBRA_RUN_DIR  => ['var', 'run', 'zebradb'],
601
    PLACK_RUN_DIR  => ['var', 'run', 'plack'],
562
);
602
);
563
603
564
WriteMakefile(
604
WriteMakefile(
Lines 865-870 Group); Link Here
865
    }
905
    }
866
906
867
    $msg = q(
907
    $msg = q(
908
Please specify which WebServer you will use
909
to serve data in Koha.  The choices are Apache2 and
910
NGINX; please note that at the moment
911
NGINX support is highly experimental.
912
913
WebServer to use);
914
    $msg .= _add_valid_values_disp('WEBSERVER', $valid_values);
915
    $config{'WEBSERVER'} = _get_value('WEBSERVER', $msg, $defaults->{'WEBSERVER'}, $valid_values, $install_log_values);
916
917
    $msg = q(
918
Please specify which WebServer you will use
919
to serve data in Koha.  The choices are Apache2 and
920
NGINX; please note that at the moment
921
NGINX support is highly experimental.
922
923
Intranet DNS Settings);
924
    $config{'INTRANET_DNS'} = _get_value('INTRANET_DNS', $msg, $defaults->{'INTRANET_DNS'}, $valid_values, $install_log_values);
925
926
    $msg = q(
927
Please specify if you would like a DNS
928
entry for the Koha Staff Client.
929
930
OPAC DNS Settings);
931
    $config{'OPAC_DNS'} = _get_value('OPAC_DNS', $msg, $defaults->{'OPAC_DNS'}, $valid_values, $install_log_values);
932
933
    $msg = q(
934
Please specify the port you would
935
like the Koha Staff Client to use.
936
937
Intranet Port Settings);
938
    $config{'INTRANET_PORT'} = _get_value('INTRANET_PORT', $msg, $defaults->{'INTRANET_PORT'}, $valid_values, $install_log_values);
939
    $msg = q(
940
Please specify if you would like a DNS
941
entry for the Koha Staff Client.
942
943
OPAC Port Settings);
944
    $config{'OPAC_PORT'} = _get_value('OPAC_PORt', $msg, $defaults->{'OPAC_PORT'}, $valid_values, $install_log_values);
945
946
    $msg = q(
868
Please specify which database engine you will use
947
Please specify which database engine you will use
869
to store data in Koha.  The choices are MySQL and
948
to store data in Koha.  The choices are MySQL and
870
PostgreSQL; please note that at the moment
949
PostgreSQL; please note that at the moment
Lines 1237-1242 sub get_target_directories { Link Here
1237
        $dirmap{'BACKUP_DIR'} =  File::Spec->catdir(@basedir, $package, 'var', 'spool');
1316
        $dirmap{'BACKUP_DIR'} =  File::Spec->catdir(@basedir, $package, 'var', 'spool');
1238
        $dirmap{'ZEBRA_DATA_DIR'} =  File::Spec->catdir(@basedir, $package, 'var', 'lib', 'zebradb');
1317
        $dirmap{'ZEBRA_DATA_DIR'} =  File::Spec->catdir(@basedir, $package, 'var', 'lib', 'zebradb');
1239
        $dirmap{'ZEBRA_RUN_DIR'} =  File::Spec->catdir(@basedir, $package, 'var', 'run', 'zebradb');
1318
        $dirmap{'ZEBRA_RUN_DIR'} =  File::Spec->catdir(@basedir, $package, 'var', 'run', 'zebradb');
1319
        $dirmap{'PLACK_RUN_DIR'} =  File::Spec->catdir(@basedir, $package, 'var', 'run', 'plack');
1240
    } elsif ($mode eq 'dev') {
1320
    } elsif ($mode eq 'dev') {
1241
        my $curdir = File::Spec->rel2abs(File::Spec->curdir());
1321
        my $curdir = File::Spec->rel2abs(File::Spec->curdir());
1242
        $dirmap{'INTRANET_CGI_DIR'} = File::Spec->catdir($curdir);
1322
        $dirmap{'INTRANET_CGI_DIR'} = File::Spec->catdir($curdir);
Lines 1267-1272 sub get_target_directories { Link Here
1267
        $dirmap{'BACKUP_DIR'} =  File::Spec->catdir(@basedir, $package, 'var', 'spool');
1347
        $dirmap{'BACKUP_DIR'} =  File::Spec->catdir(@basedir, $package, 'var', 'spool');
1268
        $dirmap{'ZEBRA_DATA_DIR'} =  File::Spec->catdir(@basedir, $package, 'var', 'lib', 'zebradb');
1348
        $dirmap{'ZEBRA_DATA_DIR'} =  File::Spec->catdir(@basedir, $package, 'var', 'lib', 'zebradb');
1269
        $dirmap{'ZEBRA_RUN_DIR'} =  File::Spec->catdir(@basedir, $package, 'var', 'run', 'zebradb');
1349
        $dirmap{'ZEBRA_RUN_DIR'} =  File::Spec->catdir(@basedir, $package, 'var', 'run', 'zebradb');
1350
        $dirmap{'PLACK_RUN_DIR'} =  File::Spec->catdir(@basedir, $package, 'var', 'run', 'plack');
1270
    } else {
1351
    } else {
1271
        # mode is standard, i.e., 'fhs'
1352
        # mode is standard, i.e., 'fhs'
1272
        $dirmap{'INTRANET_CGI_DIR'} = File::Spec->catdir(@basedir, $package, 'intranet', 'cgi-bin');
1353
        $dirmap{'INTRANET_CGI_DIR'} = File::Spec->catdir(@basedir, $package, 'intranet', 'cgi-bin');
Lines 1289-1294 sub get_target_directories { Link Here
1289
        $dirmap{'BACKUP_DIR'} =  File::Spec->catdir(File::Spec->rootdir(), 'var', 'spool', $package);
1370
        $dirmap{'BACKUP_DIR'} =  File::Spec->catdir(File::Spec->rootdir(), 'var', 'spool', $package);
1290
        $dirmap{'ZEBRA_DATA_DIR'} =  File::Spec->catdir(File::Spec->rootdir(), 'var', 'lib', $package, 'zebradb');
1371
        $dirmap{'ZEBRA_DATA_DIR'} =  File::Spec->catdir(File::Spec->rootdir(), 'var', 'lib', $package, 'zebradb');
1291
        $dirmap{'ZEBRA_RUN_DIR'} =  File::Spec->catdir(File::Spec->rootdir(), 'var', 'run', $package, 'zebradb');
1372
        $dirmap{'ZEBRA_RUN_DIR'} =  File::Spec->catdir(File::Spec->rootdir(), 'var', 'run', $package, 'zebradb');
1373
        $dirmap{'PLACK_RUN_DIR'} =  File::Spec->catdir(File::Spec->rootdir(), 'var', 'run', $package, 'plack');
1292
    }
1374
    }
1293
1375
1294
    _get_env_overrides(\%dirmap);
1376
    _get_env_overrides(\%dirmap);
(-)a/debian/control (-196 / +246 lines)
Lines 6-112 Standards-Version: 3.8.4 Link Here
6
# NOTA BENE: Build dependencies end up as runtime dependencies as well.
6
# NOTA BENE: Build dependencies end up as runtime dependencies as well.
7
# See debian/rules, the override_dh_gencontrol rules. 
7
# See debian/rules, the override_dh_gencontrol rules. 
8
# There are some exceptions.
8
# There are some exceptions.
9
Build-Depends: libalgorithm-checkdigits-perl,
9
Build-Depends: EEEK: unknown package for Algorithm::CheckDigits,
10
 libanyevent-http-perl,
10
 EEEK: unknown package for AnyEvent,
11
 libanyevent-perl,
11
 EEEK: unknown package for AnyEvent::HTTP,
12
 libauthen-cas-client-perl,
12
 EEEK: unknown package for Authen::CAS::Client,
13
 libbiblio-endnotestyle-perl,
13
 EEEK: unknown package for Biblio::EndnoteStyle,
14
 libbusiness-isbn-perl,
14
 EEEK: unknown package for Business::ISBN,
15
 libcache-memcached-fast-perl,
15
 EEEK: unknown package for Cache::Memcached::Fast,
16
 libcgi-pm-perl | perl-modules,
16
 EEEK: unknown package for CGI,
17
 EEEK: unknown package for CGI::Carp,
18
 EEEK: unknown package for CGI::Session,
19
 EEEK: unknown package for CGI::Session::Serialize::yaml,
20
 EEEK: unknown package for Class::Accessor,
21
 EEEK: unknown package for Class::Factory::Util,
22
 EEEK: unknown package for Data::Dumper,
23
 EEEK: unknown package for Data::ICal,
24
 EEEK: unknown package for Data::Pagination,
25
 EEEK: unknown package for Data::Paginator,
26
 EEEK: unknown package for Date::Calc,
27
 EEEK: unknown package for Date::Manip,
28
 EEEK: unknown package for DateTime,
29
 EEEK: unknown package for DateTime::Event::ICal,
30
 EEEK: unknown package for DateTime::Format::DateParse,
31
 EEEK: unknown package for DateTime::Format::ICal,
32
 EEEK: unknown package for DateTime::Format::MySQL,
33
 EEEK: unknown package for DateTime::Set,
34
 EEEK: unknown package for DateTime::TimeZone,
35
 EEEK: unknown package for DBD::Mock,
36
 EEEK: unknown package for DBD::mysql,
37
 EEEK: unknown package for DBD::SQLite2,
38
 EEEK: unknown package for DBI,
39
 EEEK: unknown package for Digest::MD5,
40
 EEEK: unknown package for Digest::SHA,
41
 EEEK: unknown package for Email::Date,
42
 EEEK: unknown package for File::Temp,
43
 EEEK: unknown package for GD,
44
 EEEK: unknown package for GD::Barcode::UPCE,
45
 EEEK: unknown package for Getopt::Long,
46
 EEEK: unknown package for Getopt::Std,
47
 EEEK: unknown package for Graphics::Magick,
48
 EEEK: unknown package for Gravatar::URL,
49
 EEEK: unknown package for HTML::FormatText,
50
 EEEK: unknown package for HTML::Scrubber,
51
 EEEK: unknown package for HTTP::Cookies,
52
 EEEK: unknown package for HTTP::OAI,
53
 EEEK: unknown package for HTTP::Request::Common,
54
 EEEK: unknown package for IPC::Cmd,
55
 EEEK: unknown package for JSON,
56
 EEEK: unknown package for JSON::Any,
57
 EEEK: unknown package for Lingua::Stem,
58
 EEEK: unknown package for Lingua::Stem::Snowball,
59
 EEEK: unknown package for List::MoreUtils,
60
 EEEK: unknown package for List::Util,
61
 EEEK: unknown package for Locale::Currency::Format,
62
 EEEK: unknown package for Locale::Language,
63
 EEEK: unknown package for Locale::PO,
64
 EEEK: unknown package for LWP::Simple,
65
 EEEK: unknown package for LWP::UserAgent,
66
 EEEK: unknown package for Mail::Sendmail,
67
 EEEK: unknown package for MARC::Charset,
68
 EEEK: unknown package for MARC::Crosswalk::DublinCore,
69
 EEEK: unknown package for MARC::File::XML,
70
 EEEK: unknown package for MARC::Record,
71
 EEEK: unknown package for Memoize::Memcached,
72
 EEEK: unknown package for MIME::Base64,
73
 EEEK: unknown package for MIME::Lite,
74
 EEEK: unknown package for MIME::QuotedPrint,
75
 EEEK: unknown package for Modern::Perl,
76
 EEEK: unknown package for Moose,
77
 EEEK: unknown package for MooseX::Storage,
78
 EEEK: unknown package for MooseX::Types,
79
 EEEK: unknown package for Net::LDAP,
80
 EEEK: unknown package for Net::LDAP::Filter,
81
 EEEK: unknown package for Net::Server,
82
 EEEK: unknown package for Net::Z3950::ZOOM,
83
 EEEK: unknown package for Number::Format,
84
 EEEK: unknown package for PDF::API2,
85
 EEEK: unknown package for PDF::API2::Page,
86
 EEEK: unknown package for PDF::API2::Simple,
87
 EEEK: unknown package for PDF::API2::Util,
88
 EEEK: unknown package for PDF::Reuse,
89
 EEEK: unknown package for PDF::Reuse::Barcode,
90
 EEEK: unknown package for PDF::Table,
91
 EEEK: unknown package for POE,
92
 EEEK: unknown package for POSIX,
93
 EEEK: unknown package for Readonly,
94
 EEEK: unknown package for Readonly::XS,
95
 EEEK: unknown package for Schedule::At,
96
 EEEK: unknown package for SMS::Send,
97
 EEEK: unknown package for Storable,
98
 EEEK: unknown package for String::Random,
99
 EEEK: unknown package for String::RewritePrefix,
100
 EEEK: unknown package for Template,
101
 EEEK: unknown package for Term::ANSIColor,
102
 EEEK: unknown package for Test,
103
 EEEK: unknown package for Test::Deep,
104
 EEEK: unknown package for Test::Harness,
105
 EEEK: unknown package for Test::MockModule,
106
 EEEK: unknown package for Test::More,
107
 EEEK: unknown package for Test::Strict,
108
 EEEK: unknown package for Test::Warn,
109
 EEEK: unknown package for Test::YAML::Valid,
110
 EEEK: unknown package for Text::CSV,
111
 EEEK: unknown package for Text::CSV::Encoded,
112
 EEEK: unknown package for Text::CSV_XS,
113
 EEEK: unknown package for Text::Iconv,
114
 EEEK: unknown package for Text::Unaccent,
115
 EEEK: unknown package for Text::Wrap,
116
 EEEK: unknown package for Time::HiRes,
117
 EEEK: unknown package for Time::localtime,
118
 EEEK: unknown package for Time::Progress,
119
 EEEK: unknown package for Unicode::Normalize,
120
 EEEK: unknown package for UNIVERSAL::require,
121
 EEEK: unknown package for URI::Escape,
122
 EEEK: unknown package for XML::Dumper,
123
 EEEK: unknown package for XML::LibXML,
124
 EEEK: unknown package for XML::LibXSLT,
125
 EEEK: unknown package for XML::RSS,
126
 EEEK: unknown package for XML::SAX::ParserFactory,
127
 EEEK: unknown package for XML::SAX::Writer,
128
 EEEK: unknown package for XML::Simple,
129
 EEEK: unknown package for YAML,
130
 EEEK: unknown package for YAML::Syck,
17
 libcgi-session-driver-memcached-perl,
131
 libcgi-session-driver-memcached-perl,
18
 libcgi-session-perl,
19
 libcgi-session-serialize-yaml-perl,
20
 libchi-driver-memcached-perl,
132
 libchi-driver-memcached-perl,
21
 libchi-perl,
133
 libchi-perl,
22
 libclass-accessor-perl,
134
 libtemplate-plugin-htmltotext-perl, 
23
 libclass-factory-util-perl,
24
 libdata-ical-perl,
25
 libdata-paginator-perl,
26
 libdate-calc-perl,
27
 libdate-manip-perl,
28
 libdatetime-event-ical-perl,
29
 libdatetime-format-dateparse-perl,
30
 libdatetime-format-ical-perl,
31
 libdatetime-format-mysql-perl,
32
 libdatetime-perl,
33
 libdatetime-set-perl,
34
 libdatetime-timezone-perl,
35
 libdbd-mock-perl,
36
 libdbd-mysql-perl,
37
 libdbd-sqlite2-perl,
38
 libdbi-perl,
39
 libdigest-sha-perl | perl,
40
 libemail-date-perl,
41
 libgd-barcode-perl,
42
 libgd-gd2-noxpm-perl | libgd-gd2-perl,
43
 libgraphics-magick-perl,
44
 libgravatar-url-perl,
45
 libhtml-format-perl,
46
 libhtml-scrubber-perl,
47
 libhttp-oai-perl,
48
 libjson-any-perl,
49
 libjson-perl,
50
 liblingua-stem-perl,
51
 liblingua-stem-snowball-perl,
52
 liblist-moreutils-perl,
53
 liblocale-currency-format-perl,
54
 liblocale-po-perl,
55
 libmail-sendmail-perl,
56
 libmarc-charset-perl,
57
 libmarc-crosswalk-dublincore-perl,
58
 libmarc-record-perl,
59
 libmarc-xml-perl,
60
 libmemoize-memcached-perl,
61
 libmime-lite-perl,
62
 libmodern-perl-perl,
63
 libmoose-perl,
64
 libmoosex-storage-perl,
65
 libmoosex-types-perl,
66
 libnet-ldap-perl,
67
 libnet-server-perl,
68
 libnet-z3950-zoom-perl,
69
 libnumber-format-perl,
70
 libpdf-api2-perl,
71
 libpdf-api2-simple-perl,
72
 libpdf-reuse-barcode-perl,
73
 libpdf-reuse-perl,
74
 libpdf-table-perl,
75
 libpoe-perl,
76
 libreadonly-perl,
77
 libreadonly-xs-perl,
78
 libscalar-list-utils-perl,
79
 libschedule-at-perl,
80
 libsms-send-perl,
81
 libstring-rewriteprefix-perl,
82
 libtemplate-perl,
83
 libtemplate-plugin-htmltotext-perl,
84
 libtest-deep-perl,
85
 libtest-mockmodule-perl,
86
 libtest-simple-perl | perl-modules,
87
 libtest-strict-perl,
88
 libtest-warn-perl,
89
 libtest-yaml-valid-perl,
90
 libtext-csv-encoded-perl,
91
 libtext-csv-perl,
92
 libtext-csv-xs-perl,
93
 libtext-iconv-perl,
94
 libtext-unaccent-perl,
95
 libtime-progress-perl,
96
 libuniversal-require-perl,
97
 liburi-perl,
98
 libwww-perl,
99
 libxml-dumper-perl,
100
 libxml-libxml-perl,
101
 libxml-libxslt-perl,
102
 libxml-rss-perl,
103
 libxml-sax-perl,
104
 libxml-sax-writer-perl,
105
 libxml-simple-perl,
106
 libyaml-perl,
107
 libyaml-syck-perl,
108
 perl,
109
 perl-modules, 
110
 debhelper (>= 7.0.50), gettext, python, python-debian, xsltproc, docbook-xsl
135
 debhelper (>= 7.0.50), gettext, python, python-debian, xsltproc, docbook-xsl
111
136
112
Package: koha-common
137
Package: koha-common
Lines 183-289 Description: Other dep. for koha Link Here
183
 daemon, debconf, etc.).
208
 daemon, debconf, etc.).
184
209
185
Package: koha-perldeps
210
Package: koha-perldeps
186
Depends: libalgorithm-checkdigits-perl,
211
Depends: EEEK: unknown package for Algorithm::CheckDigits,
187
 libanyevent-http-perl,
212
 EEEK: unknown package for AnyEvent,
188
 libanyevent-perl,
213
 EEEK: unknown package for AnyEvent::HTTP,
189
 libauthen-cas-client-perl,
214
 EEEK: unknown package for Authen::CAS::Client,
190
 libbiblio-endnotestyle-perl,
215
 EEEK: unknown package for Biblio::EndnoteStyle,
191
 libbusiness-isbn-perl,
216
 EEEK: unknown package for Business::ISBN,
192
 libcache-memcached-fast-perl,
217
 EEEK: unknown package for Cache::Memcached::Fast,
193
 libcgi-pm-perl | perl-modules,
218
 EEEK: unknown package for CGI,
219
 EEEK: unknown package for CGI::Carp,
220
 EEEK: unknown package for CGI::Session,
221
 EEEK: unknown package for CGI::Session::Serialize::yaml,
222
 EEEK: unknown package for Class::Accessor,
223
 EEEK: unknown package for Class::Factory::Util,
224
 EEEK: unknown package for Data::Dumper,
225
 EEEK: unknown package for Data::ICal,
226
 EEEK: unknown package for Data::Pagination,
227
 EEEK: unknown package for Data::Paginator,
228
 EEEK: unknown package for Date::Calc,
229
 EEEK: unknown package for Date::Manip,
230
 EEEK: unknown package for DateTime,
231
 EEEK: unknown package for DateTime::Event::ICal,
232
 EEEK: unknown package for DateTime::Format::DateParse,
233
 EEEK: unknown package for DateTime::Format::ICal,
234
 EEEK: unknown package for DateTime::Format::MySQL,
235
 EEEK: unknown package for DateTime::Set,
236
 EEEK: unknown package for DateTime::TimeZone,
237
 EEEK: unknown package for DBD::Mock,
238
 EEEK: unknown package for DBD::mysql,
239
 EEEK: unknown package for DBD::SQLite2,
240
 EEEK: unknown package for DBI,
241
 EEEK: unknown package for Digest::MD5,
242
 EEEK: unknown package for Digest::SHA,
243
 EEEK: unknown package for Email::Date,
244
 EEEK: unknown package for File::Temp,
245
 EEEK: unknown package for GD,
246
 EEEK: unknown package for GD::Barcode::UPCE,
247
 EEEK: unknown package for Getopt::Long,
248
 EEEK: unknown package for Getopt::Std,
249
 EEEK: unknown package for Graphics::Magick,
250
 EEEK: unknown package for Gravatar::URL,
251
 EEEK: unknown package for HTML::FormatText,
252
 EEEK: unknown package for HTML::Scrubber,
253
 EEEK: unknown package for HTTP::Cookies,
254
 EEEK: unknown package for HTTP::OAI,
255
 EEEK: unknown package for HTTP::Request::Common,
256
 EEEK: unknown package for IPC::Cmd,
257
 EEEK: unknown package for JSON,
258
 EEEK: unknown package for JSON::Any,
259
 EEEK: unknown package for Lingua::Stem,
260
 EEEK: unknown package for Lingua::Stem::Snowball,
261
 EEEK: unknown package for List::MoreUtils,
262
 EEEK: unknown package for List::Util,
263
 EEEK: unknown package for Locale::Currency::Format,
264
 EEEK: unknown package for Locale::Language,
265
 EEEK: unknown package for Locale::PO,
266
 EEEK: unknown package for LWP::Simple,
267
 EEEK: unknown package for LWP::UserAgent,
268
 EEEK: unknown package for Mail::Sendmail,
269
 EEEK: unknown package for MARC::Charset,
270
 EEEK: unknown package for MARC::Crosswalk::DublinCore,
271
 EEEK: unknown package for MARC::File::XML,
272
 EEEK: unknown package for MARC::Record,
273
 EEEK: unknown package for Memoize::Memcached,
274
 EEEK: unknown package for MIME::Base64,
275
 EEEK: unknown package for MIME::Lite,
276
 EEEK: unknown package for MIME::QuotedPrint,
277
 EEEK: unknown package for Modern::Perl,
278
 EEEK: unknown package for Moose,
279
 EEEK: unknown package for MooseX::Storage,
280
 EEEK: unknown package for MooseX::Types,
281
 EEEK: unknown package for Net::LDAP,
282
 EEEK: unknown package for Net::LDAP::Filter,
283
 EEEK: unknown package for Net::Server,
284
 EEEK: unknown package for Net::Z3950::ZOOM,
285
 EEEK: unknown package for Number::Format,
286
 EEEK: unknown package for PDF::API2,
287
 EEEK: unknown package for PDF::API2::Page,
288
 EEEK: unknown package for PDF::API2::Simple,
289
 EEEK: unknown package for PDF::API2::Util,
290
 EEEK: unknown package for PDF::Reuse,
291
 EEEK: unknown package for PDF::Reuse::Barcode,
292
 EEEK: unknown package for PDF::Table,
293
 EEEK: unknown package for POE,
294
 EEEK: unknown package for POSIX,
295
 EEEK: unknown package for Readonly,
296
 EEEK: unknown package for Readonly::XS,
297
 EEEK: unknown package for Schedule::At,
298
 EEEK: unknown package for SMS::Send,
299
 EEEK: unknown package for Storable,
300
 EEEK: unknown package for String::Random,
301
 EEEK: unknown package for String::RewritePrefix,
302
 EEEK: unknown package for Template,
303
 EEEK: unknown package for Term::ANSIColor,
304
 EEEK: unknown package for Test,
305
 EEEK: unknown package for Test::Deep,
306
 EEEK: unknown package for Test::Harness,
307
 EEEK: unknown package for Test::MockModule,
308
 EEEK: unknown package for Test::More,
309
 EEEK: unknown package for Test::Strict,
310
 EEEK: unknown package for Test::Warn,
311
 EEEK: unknown package for Test::YAML::Valid,
312
 EEEK: unknown package for Text::CSV,
313
 EEEK: unknown package for Text::CSV::Encoded,
314
 EEEK: unknown package for Text::CSV_XS,
315
 EEEK: unknown package for Text::Iconv,
316
 EEEK: unknown package for Text::Unaccent,
317
 EEEK: unknown package for Text::Wrap,
318
 EEEK: unknown package for Time::HiRes,
319
 EEEK: unknown package for Time::localtime,
320
 EEEK: unknown package for Time::Progress,
321
 EEEK: unknown package for Unicode::Normalize,
322
 EEEK: unknown package for UNIVERSAL::require,
323
 EEEK: unknown package for URI::Escape,
324
 EEEK: unknown package for XML::Dumper,
325
 EEEK: unknown package for XML::LibXML,
326
 EEEK: unknown package for XML::LibXSLT,
327
 EEEK: unknown package for XML::RSS,
328
 EEEK: unknown package for XML::SAX::ParserFactory,
329
 EEEK: unknown package for XML::SAX::Writer,
330
 EEEK: unknown package for XML::Simple,
331
 EEEK: unknown package for YAML,
332
 EEEK: unknown package for YAML::Syck,
194
 libcgi-session-driver-memcached-perl,
333
 libcgi-session-driver-memcached-perl,
195
 libcgi-session-perl,
196
 libcgi-session-serialize-yaml-perl,
197
 libchi-driver-memcached-perl,
334
 libchi-driver-memcached-perl,
198
 libchi-perl,
335
 libchi-perl,
199
 libclass-accessor-perl,
336
 libtemplate-plugin-htmltotext-perl
200
 libclass-factory-util-perl,
201
 libdata-ical-perl,
202
 libdata-paginator-perl,
203
 libdate-calc-perl,
204
 libdate-manip-perl,
205
 libdatetime-event-ical-perl,
206
 libdatetime-format-dateparse-perl,
207
 libdatetime-format-ical-perl,
208
 libdatetime-format-mysql-perl,
209
 libdatetime-perl,
210
 libdatetime-set-perl,
211
 libdatetime-timezone-perl,
212
 libdbd-mock-perl,
213
 libdbd-mysql-perl,
214
 libdbd-sqlite2-perl,
215
 libdbi-perl,
216
 libdigest-sha-perl | perl,
217
 libemail-date-perl,
218
 libgd-barcode-perl,
219
 libgd-gd2-noxpm-perl | libgd-gd2-perl,
220
 libgraphics-magick-perl,
221
 libgravatar-url-perl,
222
 libhtml-format-perl,
223
 libhtml-scrubber-perl,
224
 libhttp-oai-perl,
225
 libjson-any-perl,
226
 libjson-perl,
227
 liblingua-stem-perl,
228
 liblingua-stem-snowball-perl,
229
 liblist-moreutils-perl,
230
 liblocale-currency-format-perl,
231
 liblocale-po-perl,
232
 libmail-sendmail-perl,
233
 libmarc-charset-perl,
234
 libmarc-crosswalk-dublincore-perl,
235
 libmarc-record-perl,
236
 libmarc-xml-perl,
237
 libmemoize-memcached-perl,
238
 libmime-lite-perl,
239
 libmodern-perl-perl,
240
 libmoose-perl,
241
 libmoosex-storage-perl,
242
 libmoosex-types-perl,
243
 libnet-ldap-perl,
244
 libnet-server-perl,
245
 libnet-z3950-zoom-perl,
246
 libnumber-format-perl,
247
 libpdf-api2-perl,
248
 libpdf-api2-simple-perl,
249
 libpdf-reuse-barcode-perl,
250
 libpdf-reuse-perl,
251
 libpdf-table-perl,
252
 libpoe-perl,
253
 libreadonly-perl,
254
 libreadonly-xs-perl,
255
 libscalar-list-utils-perl,
256
 libschedule-at-perl,
257
 libsms-send-perl,
258
 libstring-rewriteprefix-perl,
259
 libtemplate-perl,
260
 libtemplate-plugin-htmltotext-perl,
261
 libtest-deep-perl,
262
 libtest-mockmodule-perl,
263
 libtest-simple-perl | perl-modules,
264
 libtest-strict-perl,
265
 libtest-warn-perl,
266
 libtest-yaml-valid-perl,
267
 libtext-csv-encoded-perl,
268
 libtext-csv-perl,
269
 libtext-csv-xs-perl,
270
 libtext-iconv-perl,
271
 libtext-unaccent-perl,
272
 libtime-progress-perl,
273
 libuniversal-require-perl,
274
 liburi-perl,
275
 libwww-perl,
276
 libxml-dumper-perl,
277
 libxml-libxml-perl,
278
 libxml-libxslt-perl,
279
 libxml-rss-perl,
280
 libxml-sax-perl,
281
 libxml-sax-writer-perl,
282
 libxml-simple-perl,
283
 libyaml-perl,
284
 libyaml-syck-perl,
285
 perl,
286
 perl-modules
287
Architecture: all
337
Architecture: all
288
Description: Perl dep. for koha
338
Description: Perl dep. for koha
289
 Koha is an Integrated Library Managment system for real-world libraries
339
 Koha is an Integrated Library Managment system for real-world libraries
(-)a/etc/koha-httpd.conf (-6 / +6 lines)
Lines 3-13 Link Here
3
#NameVirtualHost *
3
#NameVirtualHost *
4
4
5
## OPAC
5
## OPAC
6
<VirtualHost __WEBSERVER_IP__:__WEBSERVER_PORT__>
6
<VirtualHost __OPAC_DNS__:__OPAC_PORT__>
7
   ServerAdmin  __WEBMASTER_EMAIL__
7
   ServerAdmin  __WEBMASTER_EMAIL__
8
   DocumentRoot __OPAC_WWW_DIR__
8
   DocumentRoot __OPAC_WWW_DIR__
9
   ServerName __WEBSERVER_HOST__
9
   ServerName __OPAC_DNS__:__OPAC_PORT__
10
#  ServerAlias opac.mydomain.com
10
#  ServerAlias __OPAC_DNS__
11
   ScriptAlias /cgi-bin/koha/ "__OPAC_CGI_DIR__/opac/"
11
   ScriptAlias /cgi-bin/koha/ "__OPAC_CGI_DIR__/opac/"
12
   ScriptAlias /index.html "__OPAC_CGI_DIR__/opac/opac-main.pl"
12
   ScriptAlias /index.html "__OPAC_CGI_DIR__/opac/opac-main.pl"
13
   ScriptAlias /opac-search.pl "__OPAC_CGI_DIR__/opac/opac-search.pl"
13
   ScriptAlias /opac-search.pl "__OPAC_CGI_DIR__/opac/opac-search.pl"
Lines 97-107 Link Here
97
</VirtualHost>
97
</VirtualHost>
98
98
99
## Intranet
99
## Intranet
100
<VirtualHost __WEBSERVER_IP__:__WEBSERVER_PORT_LIBRARIAN__>
100
<VirtualHost __INTRANET_DNS__:__INTRANET_PORT__>
101
   ServerAdmin __WEBMASTER_EMAIL__
101
   ServerAdmin __WEBMASTER_EMAIL__
102
   DocumentRoot __INTRANET_WWW_DIR__
102
   DocumentRoot __INTRANET_WWW_DIR__
103
   ServerName __WEBSERVER_HOST__:__WEBSERVER_PORT_LIBRARIAN__
103
   ServerName __INTRANET_DNS__:__INTRANET_PORT__
104
#  ServerAlias intranet.mydomain.com
104
#  ServerAlias __INTRANET_DNS__
105
   ScriptAlias /cgi-bin/koha/ "__INTRANET_CGI_DIR__/"
105
   ScriptAlias /cgi-bin/koha/ "__INTRANET_CGI_DIR__/"
106
   ScriptAlias /index.html "__INTRANET_CGI_DIR__/mainpage.pl"
106
   ScriptAlias /index.html "__INTRANET_CGI_DIR__/mainpage.pl"
107
   ScriptAlias /search "__INTRANET_CGI_DIR__/search.pl"
107
   ScriptAlias /search "__INTRANET_CGI_DIR__/search.pl"
(-)a/etc/koha-nginx.conf (+52 lines)
Line 0 Link Here
1
upstream backendurl {
2
      server unix:__PLACK_RUN_DIR__/plack.sock;
3
}
4
5
server {
6
    listen __OPAC_PORT__;
7
    server_name __OPAC_DNS__;
8
    access_log  __LOG_DIR__/nginx-opac-access.log;
9
    root        __OPAC_WWW_DIR__;
10
11
    rewrite ^/$ /cgi-bin/koha/opac-main.pl;
12
    rewrite ^/cgi-bin/koha/(.*)$ /cgi-bin/koha/opac/$1;
13
14
    location    / {
15
        try_files $uri @plack;
16
    }
17
    location /opac-tmpl/ {
18
        root __OPAC_WWW_DIR__;
19
     }	
20
21
    location @plack {
22
        proxy_set_header Host $http_host;
23
        proxy_set_header X-Forwarded-Host $host;
24
        proxy_set_header X-Real-IP $remote_addr;
25
        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
26
        proxy_pass  http://backendurl;
27
    }
28
}
29
30
server {
31
    listen __INTRANET_PORT__;
32
    server_name __INTRANET_DNS__;
33
    access_log  __LOG_DIR__/nginx-intranet-access.log;
34
    root        __INTRANET_WWW_DIR__;
35
36
    rewrite ^/$ /cgi-bin/koha/mainpage.pl;
37
38
    location    / {
39
        try_files $uri @plack;
40
    }
41
    location /intranet-tmpl/ {
42
        root __INTRANET_WWW_DIR__;
43
     }	
44
45
    location @plack {
46
        proxy_set_header Host $http_host;
47
        proxy_set_header X-Forwarded-Host $host;
48
        proxy_set_header X-Real-IP $remote_addr;
49
        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
50
        proxy_pass  http://backendurl;
51
    }
52
}  
(-)a/misc/bin/koha-plack.sh (+72 lines)
Line 0 Link Here
1
#!/bin/sh -e
2
    
3
# This file is part of Koha.
4
#   
5
# Koha is free software; you can redistribute it and/or modify it under the
6
# terms of the GNU General Public License as published by the Free Software
7
# Foundation; either version 3 of the License, or (at your option) any later
8
# version.
9
#
10
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
11
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
12
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
13
#
14
# You should have received a copy of the GNU General Public License along with
15
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
16
# Suite 330, Boston, MA  02111-1307 USA
17
18
### BEGIN INIT INFO# Provides:          koha-plack
19
# Required-Start:    $syslog $remote_fs
20
# Required-Stop:     $syslog $remote_fs# Default-Start:     2 3 4 5
21
# Default-Stop:      0 1 6# Short-Description: Plack server for Koha
22
### END INIT INFO
23
24
export KOHA_CONF=__KOHA_CONF_DIR__/koha-conf.xml
25
#export OPACDIR=__OPAC_WWW_DIR__
26
#export INTRANETDIR=__OPAC_WWW_DIR__
27
export LOGDIR=__LOG_DIR__
28
USER=__KOHA_USER__
29
GROUP=__KOHA_GROUP__
30
RUNDIR=__PLACK_RUN_DIR__
31
PIDFILE=$RUNDIR/plack.pid
32
33
# Use one of these lines to choose between TCP port and UNIX socket listeners
34
SOCKET=$RUNDIR/plack.sock
35
#PORT=5000
36
37
case "$1" in
38
    start)
39
	echo "Starting Koha Plack Daemon"
40
41
      # create run and lock directories if needed;
42
      # /var/run and /var/lock are completely cleared at boot
43
      # on some platforms
44
      if [ ! -d $RUNDIR ]; then
45
        umask 022
46
        mkdir -p $RUNDIR
47
        if [ $EUID -eq 0 ]; then
48
            chown $USER:$GROUP $RUNDIR
49
        fi
50
      fi
51
52
        opt="$opt --access-log $LOGDIR/koha-access.log --error-log $LOGDIR/koha-error.log"
53
        opt="$opt -M FindBin --max-requests 50 --workers 2 -E deployment"
54
        if [ $SOCKET ]; then
55
            opt="$opt --listen $SOCKET -D --pid $PIDFILE"
56
        elif [ $PORT ]; then
57
            opt="$opt --port $PORT -D --pid $PIDFILE"
58
        fi
59
        starman $opt __SCRIPT_DIR__/koha.psgi
60
61
        if [ $SOCKET ]; then
62
            chown $USER:$GROUP $SOCKET
63
        fi
64
        ;;
65
    stop)
66
        start-stop-daemon --stop --pidfile $PIDFILE
67
        ;;
68
    *)
69
        echo "Usage: koha-plack {start|stop}"
70
        exit 1
71
        ;;
72
esac
(-)a/misc/bin/koha.psgi (+43 lines)
Line 0 Link Here
1
#!/usr/bin/perl
2
    
3
BEGIN {
4
    $ENV{'KOHA_CONF'} = '__KOHA_CONF_DIR__/koha-conf.xml';
5
    $ENV{'PERL5LIB'} = '__PERL_MODULE_DIR__';
6
}
7
    
8
use lib("__PERL_MODULE_DIR__");
9
use lib("__PERL_MODULE_DIR__/installer");
10
use Plack::Builder; 
11
use Plack::App::CGIBin;
12
use Plack::App::Directory;
13
use Plack::Middleware::Debug;
14
use Plack::App::URLMap;
15
use C4::Context;
16
use C4::Languages;
17
use C4::Members;
18
use C4::Dates;
19
use C4::Boolean;
20
use C4::Letters;
21
use C4::Koha;
22
use C4::XSLT;   
23
use C4::Branch;
24
use C4::Category;         
25
26
C4::Context->disable_syspref_cache();
27
28
my $intra=Plack::App::CGIBin->new(root => "__INTRANET_CGI_DIR__" );
29
30
my $opac = Plack::App::CGIBin->new(root => "__OPAC_CGI_DIR__");
31
my $panels = Plack::Middleware::Debug->default_panels;
32
builder {
33
    enable_if{
34
	$ENV{DEBUG}
35
    } 'Debug',  panels => [[ 'DBITrace', level => 1 ], @$panels ];
36
37
    enable "Plack::Middleware::Static";
38
39
    enable 'StackTrace';
40
41
    mount '/cgi-bin/koha/' => $intra;
42
    mount '/cgi-bin/koha/opac' => $opac;
43
};
(-)a/rewrite-config.PL (-1 / +6 lines)
Lines 82-87 $prefix = $ENV{'INSTALL_BASE'} || "/usr"; Link Here
82
%configuration = (
82
%configuration = (
83
  "__KOHA_INSTALLED_VERSION__" => "no_version_found",
83
  "__KOHA_INSTALLED_VERSION__" => "no_version_found",
84
  "__LOG_DIR__" => "/var/log",
84
  "__LOG_DIR__" => "/var/log",
85
  "__WEBSERVER__" => "apache2",
86
  "__INTRANET_DNS__" => "localhost",
87
  "__OPAC_DNS__" => "localhost",
88
  "__OPAC_PORT__" => "80",
89
  "__INTRANET_PORT__" => "8080",
85
  "__DB_TYPE__" => "mysql",
90
  "__DB_TYPE__" => "mysql",
86
  "__DB_NAME__" => "koha",
91
  "__DB_NAME__" => "koha",
87
  "__DB_HOST__" => $myhost,
92
  "__DB_HOST__" => $myhost,
Lines 119-124 $prefix = $ENV{'INSTALL_BASE'} || "/usr"; Link Here
119
  '__ZEBRA_LOCK_DIR__' => "$prefix/var/lock/zebradb",
124
  '__ZEBRA_LOCK_DIR__' => "$prefix/var/lock/zebradb",
120
  '__ZEBRA_DATA_DIR__' => "$prefix/var/lib/zebradb",
125
  '__ZEBRA_DATA_DIR__' => "$prefix/var/lib/zebradb",
121
  '__ZEBRA_RUN_DIR__' => "$prefix/var/run/zebradb",
126
  '__ZEBRA_RUN_DIR__' => "$prefix/var/run/zebradb",
127
  '__PLACK_RUN_DIR__' => "$prefix/var/run/plack",
122
  '__ZEBRA_MARC_FORMAT__' => 'marc21',
128
  '__ZEBRA_MARC_FORMAT__' => 'marc21',
123
  '__ZEBRA_LANGUAGE__' => 'en',
129
  '__ZEBRA_LANGUAGE__' => 'en',
124
  '__ZEBRA_TOKENIZER_STMT__' => 'charmap word-phrase-utf.chr',
130
  '__ZEBRA_TOKENIZER_STMT__' => 'charmap word-phrase-utf.chr',
125
- 

Return to bug 9316