From b00aa830cb521ea1254ff3eb69e17db88a948740 Mon Sep 17 00:00:00 2001 From: Ere Maijala Date: Mon, 21 May 2018 10:51:02 +0300 Subject: [PATCH] Bug 20073: Move Elasticsearch yaml files back to admin directory --- 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 0b33c06..9c114fb 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.7.4