Bugzilla – Attachment 117530 Details for
Bug 25674
Add RabbitMQ options to koha-create
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 25674: Adapt koha-create
Bug-25674-Adapt-koha-create.patch (text/plain), 5.38 KB, created by
Martin Renvoize
on 2021-03-02 16:50:14 UTC
(
hide
)
Description:
Bug 25674: Adapt koha-create
Filename:
MIME Type:
Creator:
Martin Renvoize
Created:
2021-03-02 16:50:14 UTC
Size:
5.38 KB
patch
obsolete
>From c636504361a1707b7538c49da818a502be4fc202 Mon Sep 17 00:00:00 2001 >From: Tomas Cohen Arazi <tomascohen@theke.io> >Date: Mon, 4 Jan 2021 13:14:52 -0300 >Subject: [PATCH] Bug 25674: Adapt koha-create > >This patch adds the following option switches to koha-create: > >--mb-host >--mb-port >--mb-user >--mb-pass >--mb-vhost > >They are used to override the default values on instance creation. > >To test: >1. Play with the several option switches and verify that the resulting > koha-conf.xml contains the expected data. >=> SUCCESS: It works as expected >2. Sign off :-D > >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > debian/scripts/koha-create | 67 +++++++++++++++++++++++++++++++++++++- > 1 file changed, 66 insertions(+), 1 deletion(-) > >diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create >index 6a1fe7132a..b56f225583 100755 >--- a/debian/scripts/koha-create >+++ b/debian/scripts/koha-create >@@ -83,6 +83,13 @@ Options: > --smtp-user-name user User name to be used on SMTP auth > --smtp-password pass Password to authenticate SMTP > --smtp-debug Enable debug mode for SMTP >+ >+ --mb-host host RabbitMQ host name (default: localhost) >+ --mb-port NN RabbitMQ port (default: 61613) >+ --mb-user user RabbitMQ user (default: guest) >+ --mb-pass pass RabbitMQ password (default: guest) >+ --mb-vhost vhost RabbitMQ vhost (default: koha_<instance>) >+ > --help,-h Show this help. > > Note: the instance name cannot be longer that 11 chars. >@@ -132,6 +139,11 @@ generate_config_file() { > -e "s/__SMTP_USER_NAME__/$SMTP_USER_NAME/g" \ > -e "s/__SMTP_PASSWORD__/$SMTP_PASSWORD/g" \ > -e "s/__SMTP_DEBUG__/$SMTP_DEBUG/g" \ >+ -e "s/__MESSAGE_BROKER_HOST__/$MESSAGE_BROKER_HOST/g" \ >+ -e "s/__MESSAGE_BROKER_PORT__/$MESSAGE_BROKER_PORT/g" \ >+ -e "s/__MESSAGE_BROKER_USER__/$MESSAGE_BROKER_USER/g" \ >+ -e "s/__MESSAGE_BROKER_PASS__/$MESSAGE_BROKER_PASS/g" \ >+ -e "s/__MESSAGE_BROKER_VHOST__/$MESSAGE_BROKER_VHOST/g" \ > "/etc/koha/$1" > "$2" > > } >@@ -289,6 +301,33 @@ set_smtp() > fi > } > >+set_message_broker() >+{ >+ local instance="$1" >+ >+ if [ "$CLO_MESSAGE_BROKER_HOST" != "" ]; then >+ MESSAGE_BROKER_HOST=$CLO_MESSAGE_BROKER_HOST >+ fi >+ >+ if [ "$CLO_MESSAGE_BROKER_PORT" != "" ]; then >+ MESSAGE_BROKER_PORT=$CLO_MESSAGE_BROKER_PORT >+ fi >+ >+ if [ "$CLO_MESSAGE_BROKER_USER" != "" ]; then >+ MESSAGE_BROKER_USER=$CLO_MESSAGE_BROKER_USER >+ fi >+ >+ if [ "$CLO_MESSAGE_BROKER_PASS" != "" ]; then >+ MESSAGE_BROKER_PASS=$CLO_MESSAGE_BROKER_PASS >+ fi >+ >+ if [ "$CLO_MESSAGE_BROKER_VHOST" != "" ]; then >+ MESSAGE_BROKER_VHOST=$CLO_MESSAGE_BROKER_VHOST >+ else >+ MESSAGE_BROKER_VHOST="$DEFAULT_MESSAGE_BROKER_PREFIX$instance" >+ fi >+} >+ > set_upload_path() > { > local instance="$1" >@@ -395,6 +434,14 @@ SMTP_USER_NAME="" > SMTP_PASSWORD="" > SMTP_DEBUG="0" > >+# Message broker (a.k.a. RabbitMQ) config >+DEFAULT_MESSAGE_BROKER_PREFIX="koha_" >+MESSAGE_BROKER_HOST="localhost" >+MESSAGE_BROKER_PORT="61613" >+MESSAGE_BROKER_USER="guest" >+MESSAGE_BROKER_PASS="guest" >+MESSAGE_BROKER_VHOST="" >+ > # memcached variables > USE_MEMCACHED="yes" > MEMCACHED_SERVERS="" >@@ -434,7 +481,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:,elasticsearch-server:,adminuser:,memcached-servers:,memcached-prefix:,template-cache-dir:,timezone:,upload-path:,tmp-path:,smtp-host:,smtp-port,smtp-timeout:,smtp-ssl-mode:smtp-user-name:,smtp-password:,smtp-debug,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:,smtp-host:,smtp-port:,smtp-timeout:,smtp-ssl-mode:,smtp-user-name:,smtp-password:,smtp-debug,mb-host:,mb-port:,mb-user:,mb-pass:,mb-vhost:,letsencrypt, \ > -n "$0" -- "$@"` > > # Note the quotes around `$TEMP': they are essential! >@@ -461,6 +508,12 @@ CLO_SMTP_USER_NAME="" > CLO_SMTP_PASSWORD="" > CLO_SMTP_DEBUG="" > >+CLO_MESSAGE_BROKER_HOST="" >+CLO_MESSAGE_BROKER_PORT="" >+CLO_MESSAGE_BROKER_USER="" >+CLO_MESSAGE_BROKER_PASS="" >+CLO_MESSAGE_BROKER_VHOST="" >+ > while true ; do > case "$1" in > -c|--create-db) >@@ -495,6 +548,16 @@ while true ; do > CLO_ADMINUSER="$2" ; shift 2 ;; > --enable-sru) > ENABLE_SRU="yes" ; shift ;; >+ --mb-host) >+ CLO_MESSAGE_BROKER_HOST="$2" ; shift 2 ;; >+ --mb-port) >+ CLO_MESSAGE_BROKER_PORT="$2" ; shift 2 ;; >+ --mb-user) >+ CLO_MESSAGE_BROKER_USER="$2" ; shift 2 ;; >+ --mb-pass) >+ CLO_MESSAGE_BROKER_PASS="$2" ; shift 2 ;; >+ --mb-vhost) >+ CLO_MESSAGE_BROKER_VHOST="$2" ; shift 2 ;; > --smtp-debug) > CLO_SMTP_DEBUG="1" ; shift ;; > --smtp-host) >@@ -607,6 +670,8 @@ else > set_memcached $name > fi > >+set_message_broker $name >+ > # Set template cache dir > if [ "$CLO_TEMPLATE_CACHE_DIR" != "" ]; then > TEMPLATE_CACHE_DIR="$CLO_TEMPLATE_CACHE_DIR" >-- >2.20.1
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 25674
:
114809
|
114810
|
114811
|
115005
|
117529
|
117530
|
117531
|
117532
|
117776
|
117777
|
117778
|
117779