Attachment 113607 Details for Bug 23141 – Bug 23141: Add --dbport parameter to koha-create

[patch] Bug 23141: Add --dbport parameter to koha-create

Bug-23141-Add---dbport-parameter-to-koha-create.patch (text/plain), 3.45 KB, created by Victor Grousset/tuxayo on 2020-11-13 14:23:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Victor Grousset/tuxayo

Created: 2020-11-13 14:23:46 UTC

Size: 3.45 KB

patch

obsolete

>From ed9a3f5c67e80d5dae93b52008c98cebb6d3b25d Mon Sep 17 00:00:00 2001
>From: Andreas Jonsson <andreas.jonsson@kreablo.se>
>Date: Wed, 26 Jun 2019 11:08:47 +0200
>Subject: [PATCH] Bug 23141: Add --dbport parameter to koha-create
>
>---
> debian/scripts/koha-create             | 11 ++++++++++-
> debian/templates/koha-conf-site.xml.in |  2 +-
> 2 files changed, 11 insertions(+), 2 deletions(-)
>
>diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create
>index 6a1fe7132a..3c51d7df84 100755
>--- a/debian/scripts/koha-create
>+++ b/debian/scripts/koha-create
>@@ -65,6 +65,7 @@ Options:
>   --configfile cfg_file     Specify an alternate config file for reading default values.
>   --passwdfile passwd       Specify an alternate passwd file.
>   --dbhost host             Enforce the use of the specified DB server
>+  --dbport port             Override portnumber for DB server
>   --database dbname         Enforce the use of the specified DB name (64 char limit)
>   --adminuser n             Explicit the admin user ID in the DB. Relevant in
>                             conjunction with --defaultsql and --populate-db.
>@@ -111,6 +112,7 @@ generate_config_file() {
>         -e "s/__API_SECRET__/$API_SECRET/g" \
>         -e "s/__DB_NAME__/$mysqldb/g" \
>         -e "s/__DB_HOST__/$mysqlhost/g" \
>+        -e "s/__DB_PORT__/$mysqlport/g" \
>         -e "s/__DB_USER__/$mysqluser/g" \
>         -e "s/__DB_PASS__/$mysqlpwd/g" \
>         -e "s/__ELASTICSEARCH_SERVER__/${ELASTICSEARCH_SERVER}/g" \
>@@ -434,7 +436,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:,dbport: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, \
>      -n "$0" -- "$@"`
> 
> # Note the quotes around `$TEMP': they are essential!
>@@ -491,6 +493,8 @@ while true ; do
>             CLO_DATABASE="$2" ; shift 2 ;;
>         --dbhost)
>             CLO_DBHOST="$2" ; shift 2 ;;
>+        --dbport)
>+            CLO_DBPORT="$2" ; shift 2 ;;
>         -a|--adminuser)
>             CLO_ADMINUSER="$2" ; shift 2 ;;
>         --enable-sru)
>@@ -663,6 +667,11 @@ then
>     mysqlhost="$CLO_DBHOST"
> fi
> 
>+if [ "$CLO_DBPORT" != "" ]
>+then
>+    mysqlport="$CLO_DBPORT"
>+fi
>+
> if [ "$mysqlhost" = "" ]
> then
>     mysqlhost="$(getmysqlhost)"
>diff --git a/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in
>index 1480ddeb88..f9cacf57d9 100644
>--- a/debian/templates/koha-conf-site.xml.in
>+++ b/debian/templates/koha-conf-site.xml.in
>@@ -266,7 +266,7 @@ __END_SRU_PUBLICSERVER__
>  <db_scheme>mysql</db_scheme>
>  <database>__DB_NAME__</database>
>  <hostname>__DB_HOST__</hostname>
>- <port>3306</port>
>+ <port>__DB_PORT__</port>
>  <user>__DB_USER__</user>
>  <pass>__DB_PASS__</pass>
>  <tls>__DB_USE_TLS__</tls>
>-- 
>2.29.2

Actions: View | Diff | Splinter Review

Attachments on bug 23141: 90687 | 90688 | 90689 | 91291 | 91292 | 91300 | 91408 | 105895 | 105896 | 105897 | 105898 | 105899 | 113605 | 113606 | 113607 | 113608 | 113609