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

(-)a/Makefile.PL (+37 lines)
Lines 198-203 Directory for Zebra's data files. Link Here
198
198
199
Directory for Zebra's UNIX-domain sockets.
199
Directory for Zebra's UNIX-domain sockets.
200
200
201
=item ELASTICSEARCH_SERVERS
202
203
Server:port of the Elasticsearch server to use, as a comma separated list:
204
eg. 192.168.0.100:9200, localhost:9200
205
206
=item ELASTICSEARCH_INDEX
207
208
Unique index in Elasticsearch, for this Koha-instance
209
eg. koha-mykoha  or just  koha
210
201
=item MISC_DIR
211
=item MISC_DIR
202
212
203
Directory for for miscellaenous scripts, among other
213
Directory for for miscellaenous scripts, among other
Lines 448-453 my %config_defaults = ( Link Here
448
  'USE_MEMCACHED'     => 'no',
458
  'USE_MEMCACHED'     => 'no',
449
  'MEMCACHED_SERVERS' => '127.0.0.1:11211',
459
  'MEMCACHED_SERVERS' => '127.0.0.1:11211',
450
  'MEMCACHED_NAMESPACE' => 'KOHA',
460
  'MEMCACHED_NAMESPACE' => 'KOHA',
461
  'USE_ELASTICSEARCH'     => 'no',
462
  'ELASTICSEARCH_SERVERS' => '',
463
  'ELASTICSEARCH_INDEX'  => 'koha',
451
  'FONT_DIR'          => '/usr/share/fonts/truetype/ttf-dejavu'
464
  'FONT_DIR'          => '/usr/share/fonts/truetype/ttf-dejavu'
452
);
465
);
453
466
Lines 479-484 my %valid_config_values = ( Link Here
479
  'ZEBRA_TOKENIZER' => { chr => 1, icu => 1 },
492
  'ZEBRA_TOKENIZER' => { chr => 1, icu => 1 },
480
  'RUN_DATABASE_TESTS' => { 'yes' => 1, 'no' => 1 },
493
  'RUN_DATABASE_TESTS' => { 'yes' => 1, 'no' => 1 },
481
  'USE_MEMCACHED'      => { 'yes' => 1, 'no' => 1 },
494
  'USE_MEMCACHED'      => { 'yes' => 1, 'no' => 1 },
495
  'USE_ELASTICSEARCH'  => { 'yes' => 1, 'no' => 1 },
482
);
496
);
483
497
484
# get settings from command-line
498
# get settings from command-line
Lines 1090-1095 Memcached namespace?); Link Here
1090
      $config{'MEMCACHED_NAMESPACE'} = _get_value('MEMCACHED_NAMESPACE', $msg, $defaults->{'MEMCACHED_NAMESPACE'}, $valid_values, $install_log_values);
1104
      $config{'MEMCACHED_NAMESPACE'} = _get_value('MEMCACHED_NAMESPACE', $msg, $defaults->{'MEMCACHED_NAMESPACE'}, $valid_values, $install_log_values);
1091
  }
1105
  }
1092
1106
1107
1108
  $msg = q(
1109
Use Elasticsearch to serve search results?
1110
You will need a Elasticsearch server running.);
1111
  $msg .= _add_valid_values_disp('USE_ELASTICSEARCH', $valid_values);
1112
  $config{'USE_ELASTICSEARCH'} = _get_value('USE_ELASTICSEARCH', $msg, $defaults->{'USE_ELASTICSEARCH'}, $valid_values, $install_log_values);
1113
  if ($config{'USE_ELASTICSEARCH'} eq 'yes'){
1114
      $msg = q(
1115
Define the ELASTICSEARCH_SERVERS with a comma-separated list. Eg
1116
localhost:9200, 192.168.0.100:9200
1117
);
1118
      $msg = q(
1119
Elasticsearch server addresses?);
1120
      $config{'ELASTICSEARCH_SERVERS'} = _get_value('ELASTICSEARCH_SERVERS', $msg, $defaults->{'ELASTICSEARCH_SERVERS'}, $valid_values, $install_log_values);
1121
1122
      $msg = q(
1123
What index name to use for this Koha-instance? It must be unique for each Koha
1124
sharing the same Elasticsearch-cluster
1125
1126
Elasticsearch index?);
1127
      $config{'ELASTICSEARCH_INDEX'} = _get_value('ELASTICSEARCH_INDEX', $msg, $defaults->{'ELASTICSEARCH_INDEX'}, $valid_values, $install_log_values);
1128
  }
1129
1093
  $msg = q(
1130
  $msg = q(
1094
Path to DejaVu fonts?);
1131
Path to DejaVu fonts?);
1095
  $config{'FONT_DIR'} = _get_value('FONT_DIR', $msg, $defaults->{'FONT_DIR'}, $valid_values, $install_log_values);
1132
  $config{'FONT_DIR'} = _get_value('FONT_DIR', $msg, $defaults->{'FONT_DIR'}, $valid_values, $install_log_values);
(-)a/debian/templates/koha-conf-site.xml.in (+7 lines)
Lines 311-315 __END_SRU_PUBLICSERVER__ Link Here
311
    <font type="HBO">/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf</font>
311
    <font type="HBO">/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf</font>
312
 </ttf>
312
 </ttf>
313
313
314
<!--
315
 <elasticsearch>
316
     <server>localhost:9200</server>      <!-- may be repeated to include all servers on your cluster -->
317
     <index_name>koha</index_name>  <!-- should be unique amongst all the indices on your cluster. _biblios and _authorities will be appended. -->
318
 </elasticsearch>
319
-->
320
314
</config>
321
</config>
315
</yazgfs>
322
</yazgfs>
(-)a/etc/koha-conf.xml (+5 lines)
Lines 138-142 __PAZPAR2_TOGGLE_XML_POST__ Link Here
138
    <font type="HBO">__FONT_DIR__/DejaVuSans-BoldOblique.ttf</font>
138
    <font type="HBO">__FONT_DIR__/DejaVuSans-BoldOblique.ttf</font>
139
 </ttf>
139
 </ttf>
140
140
141
 <elasticsearch>
142
     <server>__ELASTICSEARCH_SERVERS__</server>      <!-- may be repeated to include all servers on your cluster -->
143
     <index_name>__ELASTICSEARCH_INDEX__</index_name>  <!-- should be unique amongst all the indices on your cluster. _biblios and _authorities will be appended. -->
144
 </elasticsearch>
145
141
</config>
146
</config>
142
</yazgfs>
147
</yazgfs>
(-)a/rewrite-config.PL (-1 / +3 lines)
Lines 148-153 $prefix = $ENV{'INSTALL_BASE'} || "/usr"; Link Here
148
  "__USE_MEMCACHED__" => 'no',
148
  "__USE_MEMCACHED__" => 'no',
149
  "__MEMCACHED_SERVERS__" => "",
149
  "__MEMCACHED_SERVERS__" => "",
150
  "__MEMCACHED_NAMESPACE__" => "",
150
  "__MEMCACHED_NAMESPACE__" => "",
151
  "__USE_ELASTICSEARCH__" => 'no',
152
  "__ELASTICSEARCH_SERVERS__" => "",
153
  "__ELASTICSEARCH_INDEX__" => "koha",
151
  "__FONT_DIR__" => "/usr/share/fonts/truetype/ttf-dejavu",
154
  "__FONT_DIR__" => "/usr/share/fonts/truetype/ttf-dejavu",
152
);
155
);
153
156
154
- 

Return to bug 17851