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 in Zebra search engine
60
  --enable-sru              Enable the Z39.50/SRU server in Zebra search engine
Lines 104-109 generate_config_file() { Link Here
104
        -e "s/__DB_HOST__/$mysqlhost/g" \
106
        -e "s/__DB_HOST__/$mysqlhost/g" \
105
        -e "s/__DB_USER__/$mysqluser/g" \
107
        -e "s/__DB_USER__/$mysqluser/g" \
106
        -e "s/__DB_PASS__/$mysqlpwd/g" \
108
        -e "s/__DB_PASS__/$mysqlpwd/g" \
109
        -e "s/__ELASTICSEARCH_SERVER__/${ELASTICSEARCH_SERVER}/g" \
107
        -e "s/__UNIXUSER__/$username/g" \
110
        -e "s/__UNIXUSER__/$username/g" \
108
        -e "s/__UNIXGROUP__/$username/g" \
111
        -e "s/__UNIXGROUP__/$username/g" \
109
        -e "s#__TEMPLATE_CACHE_DIR__#$TEMPLATE_CACHE_DIR#g" \
112
        -e "s#__TEMPLATE_CACHE_DIR__#$TEMPLATE_CACHE_DIR#g" \
Lines 341-346 PASSWDFILE="/etc/koha/passwd" Link Here
341
USE_MEMCACHED="yes"
344
USE_MEMCACHED="yes"
342
MEMCACHED_SERVERS=""
345
MEMCACHED_SERVERS=""
343
MEMCACHED_PREFIX=""
346
MEMCACHED_PREFIX=""
347
# elasticsearch config
348
ELASTICSEARCH_SERVER="localhost:9200"
344
# hardcoded memcached defaults
349
# hardcoded memcached defaults
345
DEFAULT_MEMCACHED_SERVERS="127.0.0.1:11211"
350
DEFAULT_MEMCACHED_SERVERS="127.0.0.1:11211"
346
DEFAULT_MEMCACHED_PREFIX="koha_"
351
DEFAULT_MEMCACHED_PREFIX="koha_"
Lines 374-380 fi Link Here
374
379
375
[ $# -ge 1 ] && [ $# -le 16 ] || ( usage ; die "Error: wrong parameters" )
380
[ $# -ge 1 ] && [ $# -le 16 ] || ( usage ; die "Error: wrong parameters" )
376
381
377
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, \
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, \
378
     -n "$0" -- "$@"`
383
     -n "$0" -- "$@"`
379
384
380
# Note the quotes around `$TEMP': they are essential!
385
# Note the quotes around `$TEMP': they are essential!
Lines 387-392 CLO_DEFAULTSQL="" Link Here
387
CLO_ADMINUSER=""
392
CLO_ADMINUSER=""
388
CLO_MEMCACHED_SERVERS=""
393
CLO_MEMCACHED_SERVERS=""
389
CLO_MEMCACHED_PREFIX=""
394
CLO_MEMCACHED_PREFIX=""
395
CLO_ELASTICSEARCH_SERVER=""
390
CLO_UPLOAD_PATH=""
396
CLO_UPLOAD_PATH=""
391
CLO_TMP_PATH=""
397
CLO_TMP_PATH=""
392
CLO_LETSENCRYPT=""
398
CLO_LETSENCRYPT=""
Lines 407-412 while true ; do Link Here
407
            CLO_MEMCACHED_SERVERS="$2" ; shift 2 ;;
413
            CLO_MEMCACHED_SERVERS="$2" ; shift 2 ;;
408
        --memcached-prefix)
414
        --memcached-prefix)
409
            CLO_MEMCACHED_PREFIX="$2" ; shift 2;;
415
            CLO_MEMCACHED_PREFIX="$2" ; shift 2;;
416
        --elasticsearch-server)
417
            CLO_ELASTICSEARCH_SERVER="$2" ; shift 2 ;;
410
        -m|--marcflavor)
418
        -m|--marcflavor)
411
            CLO_ZEBRA_MARC_FORMAT="$2" ; shift 2 ;;
419
            CLO_ZEBRA_MARC_FORMAT="$2" ; shift 2 ;;
412
        -l|--zebralang)
420
        -l|--zebralang)
Lines 483-488 if [ "$CLO_TIMEZONE" != "" ]; then Link Here
483
    TIMEZONE=$CLO_TIMEZONE
491
    TIMEZONE=$CLO_TIMEZONE
484
fi
492
fi
485
493
494
if [ "${CLO_ELASTICSEARCH_SERVER}" != "" ]; then
495
    ELASTICSEARCH_SERVER="${CLO_ELASTICSEARCH_SERVER}"
496
fi
497
486
if [ "$ENABLE_SRU" != "no" ]; then
498
if [ "$ENABLE_SRU" != "no" ]; then
487
    enable_sru_server
499
    enable_sru_server
488
fi
500
fi
(-)a/debian/templates/koha-conf-site.xml.in (-2 / +1 lines)
Lines 356-362 __END_SRU_PUBLICSERVER__ Link Here
356
356
357
 <!-- Elasticsearch Configuration -->
357
 <!-- Elasticsearch Configuration -->
358
 <elasticsearch>
358
 <elasticsearch>
359
     <server>localhost:9200</server> <!-- may be repeated to include all servers on your cluster -->
359
     <server>__ELASTICSEARCH_SERVER__</server> <!-- may be repeated to include all servers on your cluster -->
360
     <index_name>koha___KOHASITE__</index_name> <!-- should be unique amongst all the indices on your cluster. _biblios and _authorities will be appended. -->
360
     <index_name>koha___KOHASITE__</index_name> <!-- should be unique amongst all the indices on your cluster. _biblios and _authorities will be appended. -->
361
 </elasticsearch>
361
 </elasticsearch>
362
 <!-- Uncomment the following line if you want to override the Elasticsearch default index settings -->
362
 <!-- Uncomment the following line if you want to override the Elasticsearch default index settings -->
363
- 

Return to bug 19465