View | Details | Raw Unified | Return to bug 23141
Collapse All | Expand All

(-)a/debian/scripts/koha-create (-1 / +10 lines)
Lines 65-70 Options: Link Here
65
  --configfile cfg_file     Specify an alternate config file for reading default values.
65
  --configfile cfg_file     Specify an alternate config file for reading default values.
66
  --passwdfile passwd       Specify an alternate passwd file.
66
  --passwdfile passwd       Specify an alternate passwd file.
67
  --dbhost host             Enforce the use of the specified DB server
67
  --dbhost host             Enforce the use of the specified DB server
68
  --dbport port             Override portnumber for DB server
68
  --database dbname         Enforce the use of the specified DB name (64 char limit)
69
  --database dbname         Enforce the use of the specified DB name (64 char limit)
69
  --adminuser n             Explicit the admin user ID in the DB. Relevant in
70
  --adminuser n             Explicit the admin user ID in the DB. Relevant in
70
                            conjunction with --defaultsql and --populate-db.
71
                            conjunction with --defaultsql and --populate-db.
Lines 104-109 generate_config_file() { Link Here
104
        -e "s/__API_SECRET__/$API_SECRET/g" \
105
        -e "s/__API_SECRET__/$API_SECRET/g" \
105
        -e "s/__DB_NAME__/$mysqldb/g" \
106
        -e "s/__DB_NAME__/$mysqldb/g" \
106
        -e "s/__DB_HOST__/$mysqlhost/g" \
107
        -e "s/__DB_HOST__/$mysqlhost/g" \
108
        -e "s/__DB_PORT__/$mysqlport/g" \
107
        -e "s/__DB_USER__/$mysqluser/g" \
109
        -e "s/__DB_USER__/$mysqluser/g" \
108
        -e "s/__DB_PASS__/$mysqlpwd/g" \
110
        -e "s/__DB_PASS__/$mysqlpwd/g" \
109
        -e "s/__ELASTICSEARCH_SERVER__/${ELASTICSEARCH_SERVER}/g" \
111
        -e "s/__ELASTICSEARCH_SERVER__/${ELASTICSEARCH_SERVER}/g" \
Lines 379-385 fi Link Here
379
381
380
[ $# -ge 1 ] && [ $# -le 16 ] || ( usage ; die "Error: wrong parameters" )
382
[ $# -ge 1 ] && [ $# -le 16 ] || ( usage ; die "Error: wrong parameters" )
381
383
382
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, \
384
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:,letsencrypt, \
383
     -n "$0" -- "$@"`
385
     -n "$0" -- "$@"`
384
386
385
# Note the quotes around `$TEMP': they are essential!
387
# Note the quotes around `$TEMP': they are essential!
Lines 429-434 while true ; do Link Here
429
            CLO_DATABASE="$2" ; shift 2 ;;
431
            CLO_DATABASE="$2" ; shift 2 ;;
430
        --dbhost)
432
        --dbhost)
431
            CLO_DBHOST="$2" ; shift 2 ;;
433
            CLO_DBHOST="$2" ; shift 2 ;;
434
        --dbport)
435
            CLO_DBPORT="$2" ; shift 2 ;;
432
        -a|--adminuser)
436
        -a|--adminuser)
433
            CLO_ADMINUSER="$2" ; shift 2 ;;
437
            CLO_ADMINUSER="$2" ; shift 2 ;;
434
        --enable-sru)
438
        --enable-sru)
Lines 583-588 then Link Here
583
    mysqlhost="$CLO_DBHOST"
587
    mysqlhost="$CLO_DBHOST"
584
fi
588
fi
585
589
590
if [ "$CLO_DBPORT" != "" ]
591
then
592
    mysqlport="$CLO_DBPORT"
593
fi
594
586
if [ "$mysqlhost" = "" ]
595
if [ "$mysqlhost" = "" ]
587
then
596
then
588
    mysqlhost="$(getmysqlhost)"
597
    mysqlhost="$(getmysqlhost)"
(-)a/debian/templates/koha-conf-site.xml.in (-2 / +1 lines)
Lines 266-272 __END_SRU_PUBLICSERVER__ Link Here
266
 <db_scheme>mysql</db_scheme>
266
 <db_scheme>mysql</db_scheme>
267
 <database>__DB_NAME__</database>
267
 <database>__DB_NAME__</database>
268
 <hostname>__DB_HOST__</hostname>
268
 <hostname>__DB_HOST__</hostname>
269
 <port>3306</port>
269
 <port>__DB_PORT__</port>
270
 <user>__DB_USER__</user>
270
 <user>__DB_USER__</user>
271
 <pass>__DB_PASS__</pass>
271
 <pass>__DB_PASS__</pass>
272
 <tls>__DB_USE_TLS__</tls>
272
 <tls>__DB_USE_TLS__</tls>
273
- 

Return to bug 23141