Bugzilla – Attachment 75831 Details for
Bug 20073
Move Elasticsearch settings to configuration files
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 20073: Move Elasticsearch yaml files back to admin directory
Bug-20073-Move-Elasticsearch-yaml-files-back-to-ad.patch (text/plain), 3.24 KB, created by
Kyle M Hall (khall)
on 2018-06-05 18:20:12 UTC
(
hide
)
Description:
Bug 20073: Move Elasticsearch yaml files back to admin directory
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2018-06-05 18:20:12 UTC
Size:
3.24 KB
patch
obsolete
>From 0fc7c24e9a7720e89e66f7136c8b31d16ff77583 Mon Sep 17 00:00:00 2001 >From: Ere Maijala <ere.maijala@helsinki.fi> >Date: Mon, 21 May 2018 10:51:02 +0300 >Subject: [PATCH] Bug 20073: Move Elasticsearch yaml files back to admin > directory > >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > Koha/SearchEngine/Elasticsearch.pm | 6 +++--- > {etc => admin}/searchengine/elasticsearch/field_config.yaml | 0 > {etc => admin}/searchengine/elasticsearch/index_config.yaml | 0 > {etc => admin}/searchengine/elasticsearch/mappings.yaml | 0 > 4 files changed, 3 insertions(+), 3 deletions(-) > rename {etc => admin}/searchengine/elasticsearch/field_config.yaml (100%) > rename {etc => admin}/searchengine/elasticsearch/index_config.yaml (100%) > rename {etc => admin}/searchengine/elasticsearch/mappings.yaml (100%) > >diff --git a/Koha/SearchEngine/Elasticsearch.pm b/Koha/SearchEngine/Elasticsearch.pm >index 0b33c06b3b..9c114fb060 100644 >--- a/Koha/SearchEngine/Elasticsearch.pm >+++ b/Koha/SearchEngine/Elasticsearch.pm >@@ -139,7 +139,7 @@ sub get_elasticsearch_settings { > state $settings = undef; > if (!defined $settings) { > my $config_file = C4::Context->config('elasticsearch_index_config'); >- $config_file ||= C4::Context->config('intranetdir') . '/etc/searchengine/elasticsearch/index_config.yaml'; >+ $config_file ||= C4::Context->config('intranetdir') . '/admin/searchengine/elasticsearch/index_config.yaml'; > $settings = LoadFile( $config_file ); > } > >@@ -226,7 +226,7 @@ sub _get_elasticsearch_mapping { > state $settings = undef; > if (!defined $settings) { > my $config_file = C4::Context->config('elasticsearch_field_config'); >- $config_file ||= C4::Context->config('intranetdir') . '/etc/searchengine/elasticsearch/field_config.yaml'; >+ $config_file ||= C4::Context->config('intranetdir') . '/admin/searchengine/elasticsearch/field_config.yaml'; > $settings = LoadFile( $config_file ); > } > >@@ -248,7 +248,7 @@ sub _get_elasticsearch_mapping { > sub reset_elasticsearch_mappings { > my ( $reset_fields ) = @_; > my $mappings_yaml = C4::Context->config('elasticsearch_index_mappings'); >- $mappings_yaml ||= C4::Context->config('intranetdir') . '/etc/searchengine/elasticsearch/mappings.yaml'; >+ $mappings_yaml ||= C4::Context->config('intranetdir') . '/admin/searchengine/elasticsearch/mappings.yaml'; > my $indexes = LoadFile( $mappings_yaml ); > > while ( my ( $index_name, $fields ) = each %$indexes ) { >diff --git a/etc/searchengine/elasticsearch/field_config.yaml b/admin/searchengine/elasticsearch/field_config.yaml >similarity index 100% >rename from etc/searchengine/elasticsearch/field_config.yaml >rename to admin/searchengine/elasticsearch/field_config.yaml >diff --git a/etc/searchengine/elasticsearch/index_config.yaml b/admin/searchengine/elasticsearch/index_config.yaml >similarity index 100% >rename from etc/searchengine/elasticsearch/index_config.yaml >rename to admin/searchengine/elasticsearch/index_config.yaml >diff --git a/etc/searchengine/elasticsearch/mappings.yaml b/admin/searchengine/elasticsearch/mappings.yaml >similarity index 100% >rename from etc/searchengine/elasticsearch/mappings.yaml >rename to admin/searchengine/elasticsearch/mappings.yaml >-- >2.15.1 (Apple Git-101)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 20073
:
70827
|
70836
|
70837
|
73054
|
73138
|
73144
|
73383
|
74420
|
74421
|
74759
|
75438
|
75453
|
75829
|
75830
| 75831 |
76315
|
76520