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

(-)a/debian/scripts/koha-create (-1 / +10 lines)
Lines 62-67 Options: Link Here
62
  --configfile cfg_file     Specify an alternate config file for reading default values.
62
  --configfile cfg_file     Specify an alternate config file for reading default values.
63
  --passwdfile passwd       Specify an alternate passwd file.
63
  --passwdfile passwd       Specify an alternate passwd file.
64
  --dbhost host             Enforce the use of the specified DB server
64
  --dbhost host             Enforce the use of the specified DB server
65
  --dbport port             Override portnumber for DB server
65
  --database dbname         Enforce the use of the specified DB name (64 char limit)
66
  --database dbname         Enforce the use of the specified DB name (64 char limit)
66
  --adminuser n             Explicit the admin user ID in the DB. Relevant in
67
  --adminuser n             Explicit the admin user ID in the DB. Relevant in
67
                            conjunction with --defaultsql and --populate-db.
68
                            conjunction with --defaultsql and --populate-db.
Lines 101-106 generate_config_file() { Link Here
101
        -e "s/__API_SECRET__/$API_SECRET/g" \
102
        -e "s/__API_SECRET__/$API_SECRET/g" \
102
        -e "s/__DB_NAME__/$mysqldb/g" \
103
        -e "s/__DB_NAME__/$mysqldb/g" \
103
        -e "s/__DB_HOST__/$mysqlhost/g" \
104
        -e "s/__DB_HOST__/$mysqlhost/g" \
105
        -e "s/__DB_PORT__/$mysqlport/g" \
104
        -e "s/__DB_USER__/$mysqluser/g" \
106
        -e "s/__DB_USER__/$mysqluser/g" \
105
        -e "s/__DB_PASS__/$mysqlpwd/g" \
107
        -e "s/__DB_PASS__/$mysqlpwd/g" \
106
        -e "s/__UNIXUSER__/$username/g" \
108
        -e "s/__UNIXUSER__/$username/g" \
Lines 373-379 fi Link Here
373
375
374
[ $# -ge 1 ] && [ $# -le 16 ] || ( usage ; die "Error: wrong parameters" )
376
[ $# -ge 1 ] && [ $# -le 16 ] || ( usage ; die "Error: wrong parameters" )
375
377
376
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, \
378
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:,adminuser:,memcached-servers:,memcached-prefix:,template-cache-dir:,timezone:,upload-path:,tmp-path:,letsencrypt, \
377
     -n "$0" -- "$@"`
379
     -n "$0" -- "$@"`
378
380
379
# Note the quotes around `$TEMP': they are essential!
381
# Note the quotes around `$TEMP': they are essential!
Lines 420-425 while true ; do Link Here
420
            CLO_DATABASE="$2" ; shift 2 ;;
422
            CLO_DATABASE="$2" ; shift 2 ;;
421
        --dbhost)
423
        --dbhost)
422
            CLO_DBHOST="$2" ; shift 2 ;;
424
            CLO_DBHOST="$2" ; shift 2 ;;
425
        --dbport)
426
            CLO_DBPORT="$2" ; shift 2 ;;
423
        -a|--adminuser)
427
        -a|--adminuser)
424
            CLO_ADMINUSER="$2" ; shift 2 ;;
428
            CLO_ADMINUSER="$2" ; shift 2 ;;
425
        --enable-sru)
429
        --enable-sru)
Lines 570-575 then Link Here
570
    mysqlhost="$CLO_DBHOST"
574
    mysqlhost="$CLO_DBHOST"
571
fi
575
fi
572
576
577
if [ "$CLO_DBPORT" != "" ]
578
then
579
    mysqlport="$CLO_DBPORT"
580
fi
581
573
if [ "$mysqlhost" = "" ]
582
if [ "$mysqlhost" = "" ]
574
then
583
then
575
    mysqlhost="$(getmysqlhost)"
584
    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
 <biblioserver>biblios</biblioserver>
272
 <biblioserver>biblios</biblioserver>
273
- 

Return to bug 23141