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

(-)a/debian/scripts/koha-create (-1 / +13 lines)
Lines 53-58 Options: Link Here
53
                            normarc and unimarc.
53
                            normarc and unimarc.
54
  --zebralang lang          Choose the primary language for Zebra indexing. Valid
54
  --zebralang lang          Choose the primary language for Zebra indexing. Valid
55
                            values are cs, en (default), es, fr, gr, nb, ru and uk.
55
                            values are cs, en (default), es, fr, gr, nb, ru and uk.
56
  --elasticsearch-server s  Enforce the use of the specified Elasticsearch server(s)
57
                            (default: localhost:9200).
56
  --memcached-servers str   Set a comma-separated list of host:port memcached servers.
58
  --memcached-servers str   Set a comma-separated list of host:port memcached servers.
57
  --memcached-prefix str    Set the desired prefix for the instance memcached namespace.
59
  --memcached-prefix str    Set the desired prefix for the instance memcached namespace.
58
  --enable-sru              Enable the Z39.50/SRU server (default: disabled).
60
  --enable-sru              Enable the Z39.50/SRU server (default: disabled).
Lines 103-108 generate_config_file() { Link Here
103
        -e "s/__DB_HOST__/$mysqlhost/g" \
105
        -e "s/__DB_HOST__/$mysqlhost/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" \
108
        -e "s/__ELASTICSEARCH_SERVER__/${ELASTICSEARCH_SERVER}/g" \
106
        -e "s/__UNIXUSER__/$username/g" \
109
        -e "s/__UNIXUSER__/$username/g" \
107
        -e "s/__UNIXGROUP__/$username/g" \
110
        -e "s/__UNIXGROUP__/$username/g" \
108
        -e "s#__TEMPLATE_CACHE_DIR__#$TEMPLATE_CACHE_DIR#g" \
111
        -e "s#__TEMPLATE_CACHE_DIR__#$TEMPLATE_CACHE_DIR#g" \
Lines 340-345 PASSWDFILE="/etc/koha/passwd" Link Here
340
USE_MEMCACHED="yes"
343
USE_MEMCACHED="yes"
341
MEMCACHED_SERVERS=""
344
MEMCACHED_SERVERS=""
342
MEMCACHED_PREFIX=""
345
MEMCACHED_PREFIX=""
346
# elasticsearch config
347
ELASTICSEARCH_SERVER="localhost:9200"
343
# hardcoded memcached defaults
348
# hardcoded memcached defaults
344
DEFAULT_MEMCACHED_SERVERS="127.0.0.1:11211"
349
DEFAULT_MEMCACHED_SERVERS="127.0.0.1:11211"
345
DEFAULT_MEMCACHED_PREFIX="koha_"
350
DEFAULT_MEMCACHED_PREFIX="koha_"
Lines 373-379 fi Link Here
373
378
374
[ $# -ge 1 ] && [ $# -le 16 ] || ( usage ; die "Error: wrong parameters" )
379
[ $# -ge 1 ] && [ $# -le 16 ] || ( usage ; die "Error: wrong parameters" )
375
380
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, \
381
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, \
377
     -n "$0" -- "$@"`
382
     -n "$0" -- "$@"`
378
383
379
# Note the quotes around `$TEMP': they are essential!
384
# Note the quotes around `$TEMP': they are essential!
Lines 386-391 CLO_DEFAULTSQL="" Link Here
386
CLO_ADMINUSER=""
391
CLO_ADMINUSER=""
387
CLO_MEMCACHED_SERVERS=""
392
CLO_MEMCACHED_SERVERS=""
388
CLO_MEMCACHED_PREFIX=""
393
CLO_MEMCACHED_PREFIX=""
394
CLO_ELASTICSEARCH_SERVER=""
389
CLO_UPLOAD_PATH=""
395
CLO_UPLOAD_PATH=""
390
CLO_TMP_PATH=""
396
CLO_TMP_PATH=""
391
CLO_LETSENCRYPT=""
397
CLO_LETSENCRYPT=""
Lines 406-411 while true ; do Link Here
406
            CLO_MEMCACHED_SERVERS="$2" ; shift 2 ;;
412
            CLO_MEMCACHED_SERVERS="$2" ; shift 2 ;;
407
        --memcached-prefix)
413
        --memcached-prefix)
408
            CLO_MEMCACHED_PREFIX="$2" ; shift 2;;
414
            CLO_MEMCACHED_PREFIX="$2" ; shift 2;;
415
        --elasticsearch-server)
416
            CLO_ELASTICSEARCH_SERVER="$2" ; shift 2 ;;
409
        -m|--marcflavor)
417
        -m|--marcflavor)
410
            CLO_ZEBRA_MARC_FORMAT="$2" ; shift 2 ;;
418
            CLO_ZEBRA_MARC_FORMAT="$2" ; shift 2 ;;
411
        -l|--zebralang)
419
        -l|--zebralang)
Lines 482-487 if [ "$CLO_TIMEZONE" != "" ]; then Link Here
482
    TIMEZONE=$CLO_TIMEZONE
490
    TIMEZONE=$CLO_TIMEZONE
483
fi
491
fi
484
492
493
if [ "${CLO_ELASTICSEARCH_SERVER}" != "" ]; then
494
    ELASTICSEARCH_SERVER="${CLO_ELASTICSEARCH_SERVER}"
495
fi
496
485
if [ "$ENABLE_SRU" != "no" ]; then
497
if [ "$ENABLE_SRU" != "no" ]; then
486
    enable_sru_server
498
    enable_sru_server
487
fi
499
fi
(-)a/debian/templates/koha-conf-site.xml.in (-2 / +1 lines)
Lines 343-349 __END_SRU_PUBLICSERVER__ Link Here
343
343
344
 <!-- Elasticsearch Configuration -->
344
 <!-- Elasticsearch Configuration -->
345
 <elasticsearch>
345
 <elasticsearch>
346
     <server>localhost:9200</server>
346
     <server>__ELASTICSEARCH_SERVER__</server>
347
     <index_name>koha___KOHASITE__</index_name>
347
     <index_name>koha___KOHASITE__</index_name>
348
 </elasticsearch>
348
 </elasticsearch>
349
 <!-- Uncomment the following line if you want to override the Elasticsearch default index settings -->
349
 <!-- Uncomment the following line if you want to override the Elasticsearch default index settings -->
350
- 

Return to bug 19465