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 111-116 generate_config_file() { Link Here
111
        -e "s/__API_SECRET__/$API_SECRET/g" \
112
        -e "s/__API_SECRET__/$API_SECRET/g" \
112
        -e "s/__DB_NAME__/$mysqldb/g" \
113
        -e "s/__DB_NAME__/$mysqldb/g" \
113
        -e "s/__DB_HOST__/$mysqlhost/g" \
114
        -e "s/__DB_HOST__/$mysqlhost/g" \
115
        -e "s/__DB_PORT__/$mysqlport/g" \
114
        -e "s/__DB_USER__/$mysqluser/g" \
116
        -e "s/__DB_USER__/$mysqluser/g" \
115
        -e "s/__DB_PASS__/$mysqlpwd/g" \
117
        -e "s/__DB_PASS__/$mysqlpwd/g" \
116
        -e "s/__ELASTICSEARCH_SERVER__/${ELASTICSEARCH_SERVER}/g" \
118
        -e "s/__ELASTICSEARCH_SERVER__/${ELASTICSEARCH_SERVER}/g" \
Lines 434-440 fi Link Here
434
436
435
[ $# -ge 1 ] && [ $# -le 16 ] || ( usage ; die "Error: wrong parameters" )
437
[ $# -ge 1 ] && [ $# -le 16 ] || ( usage ; die "Error: wrong parameters" )
436
438
437
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, \
439
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, \
438
     -n "$0" -- "$@"`
440
     -n "$0" -- "$@"`
439
441
440
# Note the quotes around `$TEMP': they are essential!
442
# Note the quotes around `$TEMP': they are essential!
Lines 491-496 while true ; do Link Here
491
            CLO_DATABASE="$2" ; shift 2 ;;
493
            CLO_DATABASE="$2" ; shift 2 ;;
492
        --dbhost)
494
        --dbhost)
493
            CLO_DBHOST="$2" ; shift 2 ;;
495
            CLO_DBHOST="$2" ; shift 2 ;;
496
        --dbport)
497
            CLO_DBPORT="$2" ; shift 2 ;;
494
        -a|--adminuser)
498
        -a|--adminuser)
495
            CLO_ADMINUSER="$2" ; shift 2 ;;
499
            CLO_ADMINUSER="$2" ; shift 2 ;;
496
        --enable-sru)
500
        --enable-sru)
Lines 663-668 then Link Here
663
    mysqlhost="$CLO_DBHOST"
667
    mysqlhost="$CLO_DBHOST"
664
fi
668
fi
665
669
670
if [ "$CLO_DBPORT" != "" ]
671
then
672
    mysqlport="$CLO_DBPORT"
673
fi
674
666
if [ "$mysqlhost" = "" ]
675
if [ "$mysqlhost" = "" ]
667
then
676
then
668
    mysqlhost="$(getmysqlhost)"
677
    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