Bugzilla – Attachment 80748 Details for
Bug 19465
Allow choosing Elasticsearch server on instance creation
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 19465: Add --elasticsearch-server option to koha-create
Bug-19465-Add---elasticsearch-server-option-to-koh.patch (text/plain), 4.79 KB, created by
Mark Tompsett
on 2018-10-17 18:30:46 UTC
(
hide
)
Description:
Bug 19465: Add --elasticsearch-server option to koha-create
Filename:
MIME Type:
Creator:
Mark Tompsett
Created:
2018-10-17 18:30:46 UTC
Size:
4.79 KB
patch
obsolete
>From 721589809f06d56125b8ca031d07aeb8ee4e7f57 Mon Sep 17 00:00:00 2001 >From: Tomas Cohen Arazi <tomascohen@theke.io> >Date: Fri, 13 Oct 2017 15:59:25 -0300 >Subject: [PATCH] Bug 19465: Add --elasticsearch-server option to koha-create > >This patch adds the --elasticsearch-server option switch to koha-create. >It allows choosing a different Elasticsearch configuration. It defaults >to the current 'localhost:9200' value. > >To test: >- Apply this patches >- Run: > $ reset_all > $ man koha-create >=> SUCCESS: The man page shows correct information about the added >option switch >- Run: > $ sudo koha-create --create-db test >=> SUCCESS: /etc/koha/sites/test/koha-conf.xml contains the default > value (i.e. the current behaviour is kept) >- Run: > $ sudo koha-create --create-db --elasticsearch-server tomas:1234 test2 >=> SUCCESS: /etc/koha/sites/test2/koha-conf.xml contains the passed > value in the <elasticsearch><server> section. >- Sign off :-D > >Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> >--- > debian/scripts/koha-create | 14 +++++++++++++- > debian/templates/koha-conf-site.xml.in | 2 +- > 2 files changed, 14 insertions(+), 2 deletions(-) > >diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create >index 5e60f7cd77..f32e07effe 100755 >--- a/debian/scripts/koha-create >+++ b/debian/scripts/koha-create >@@ -53,6 +53,8 @@ Options: > normarc and unimarc. > --zebralang lang Choose the primary language for Zebra indexing. Valid > values are cs, en (default), es, fr, gr, nb, ru and uk. >+ --elasticsearch-server s Enforce the use of the specified Elasticsearch server(s) >+ (default: localhost:9200). > --memcached-servers str Set a comma-separated list of host:port memcached servers. > --memcached-prefix str Set the desired prefix for the instance memcached namespace. > --enable-sru Enable the Z39.50/SRU server (default: disabled). >@@ -103,6 +105,7 @@ generate_config_file() { > -e "s/__DB_HOST__/$mysqlhost/g" \ > -e "s/__DB_USER__/$mysqluser/g" \ > -e "s/__DB_PASS__/$mysqlpwd/g" \ >+ -e "s/__ELASTICSEARCH_SERVER__/${ELASTICSEARCH_SERVER}/g" \ > -e "s/__UNIXUSER__/$username/g" \ > -e "s/__UNIXGROUP__/$username/g" \ > -e "s#__TEMPLATE_CACHE_DIR__#$TEMPLATE_CACHE_DIR#g" \ >@@ -340,6 +343,8 @@ PASSWDFILE="/etc/koha/passwd" > USE_MEMCACHED="yes" > MEMCACHED_SERVERS="" > MEMCACHED_PREFIX="" >+# elasticsearch config >+ELASTICSEARCH_SERVER="localhost:9200" > # hardcoded memcached defaults > DEFAULT_MEMCACHED_SERVERS="127.0.0.1:11211" > DEFAULT_MEMCACHED_PREFIX="koha_" >@@ -373,7 +378,7 @@ fi > > [ $# -ge 1 ] && [ $# -le 16 ] || ( usage ; die "Error: wrong parameters" ) > >-TEMP=`getopt -o chrpm:l:d:f:b:a: -l create-db,request-db,populate-db,use-db,enable-sru,sru-port:,help,marcflavor:,auth-idx:,biblio-idx:,zebralang:,defaultsql:,configfile:,passwdfile:,dbhost:,database:,adminuser:,memcached-servers:,memcached-prefix:,template-cache-dir:,timezone:,upload-path:,tmp-path:,letsencrypt, \ >+TEMP=`getopt -o chrpm:l:d:f:b:a: -l create-db,request-db,populate-db,use-db,enable-sru,sru-port:,help,marcflavor:,auth-idx:,biblio-idx:,zebralang:,defaultsql:,configfile:,passwdfile:,dbhost:,database:,elasticsearch-server:,adminuser:,memcached-servers:,memcached-prefix:,template-cache-dir:,timezone:,upload-path:,tmp-path:,letsencrypt, \ > -n "$0" -- "$@"` > > # Note the quotes around `$TEMP': they are essential! >@@ -386,6 +391,7 @@ CLO_DEFAULTSQL="" > CLO_ADMINUSER="" > CLO_MEMCACHED_SERVERS="" > CLO_MEMCACHED_PREFIX="" >+CLO_ELASTICSEARCH_SERVER="" > CLO_UPLOAD_PATH="" > CLO_TMP_PATH="" > CLO_LETSENCRYPT="" >@@ -406,6 +412,8 @@ while true ; do > CLO_MEMCACHED_SERVERS="$2" ; shift 2 ;; > --memcached-prefix) > CLO_MEMCACHED_PREFIX="$2" ; shift 2;; >+ --elasticsearch-server) >+ CLO_ELASTICSEARCH_SERVER="$2" ; shift 2 ;; > -m|--marcflavor) > CLO_ZEBRA_MARC_FORMAT="$2" ; shift 2 ;; > -l|--zebralang) >@@ -482,6 +490,10 @@ if [ "$CLO_TIMEZONE" != "" ]; then > TIMEZONE=$CLO_TIMEZONE > fi > >+if [ "${CLO_ELASTICSEARCH_SERVER}" != "" ]; then >+ ELASTICSEARCH_SERVER="${CLO_ELASTICSEARCH_SERVER}" >+fi >+ > if [ "$ENABLE_SRU" != "no" ]; then > enable_sru_server > fi >diff --git a/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in >index e6982bb27c..67a8df2c04 100644 >--- a/debian/templates/koha-conf-site.xml.in >+++ b/debian/templates/koha-conf-site.xml.in >@@ -343,7 +343,7 @@ __END_SRU_PUBLICSERVER__ > > <!-- Elasticsearch Configuration --> > <elasticsearch> >- <server>localhost:9200</server> >+ <server>__ELASTICSEARCH_SERVER__</server> > <index_name>koha___KOHASITE__</index_name> > </elasticsearch> > <!-- Uncomment the following line if you want to override the Elasticsearch default index settings --> >-- >2.11.0
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 19465
:
68094
|
68095
|
73953
|
73954
|
80748
|
80749
|
90074
|
96046
|
96047