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

(-)a/debian/scripts/koha-create (-1 / +13 lines)
Lines 57-62 Options: Link Here
57
                            values are dom (default) and grs1.
57
                            values are dom (default) and grs1.
58
  --biblio-idx idx_mode     Set the indexing mode for bibliographic records.
58
  --biblio-idx idx_mode     Set the indexing mode for bibliographic records.
59
                            Valid values are dom (default) and grs1.
59
                            Valid values are dom (default) and grs1.
60
  --elasticsearch-server s  Enforce the use of the specified Elasticsearch server(s)
61
                            (default: localhost:9200).
60
  --use-memcached           Set the instance to make use of memcache.
62
  --use-memcached           Set the instance to make use of memcache.
61
  --memcached-servers str   Set a comma-separated list of host:port memcached servers.
63
  --memcached-servers str   Set a comma-separated list of host:port memcached servers.
62
  --memcached-prefix str    Set the desired prefix for the instance memcached namespace.
64
  --memcached-prefix str    Set the desired prefix for the instance memcached namespace.
Lines 113-118 generate_config_file() { Link Here
113
        -e "s/__DB_HOST__/$mysqlhost/g" \
115
        -e "s/__DB_HOST__/$mysqlhost/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" \
118
        -e "s/__ELASTICSEARCH_SERVER__/${ELASTICSEARCH_SERVER}/g" \
116
        -e "s/__UNIXUSER__/$username/g" \
119
        -e "s/__UNIXUSER__/$username/g" \
117
        -e "s/__UNIXGROUP__/$username/g" \
120
        -e "s/__UNIXGROUP__/$username/g" \
118
        -e "s#__TEMPLATE_CACHE_DIR__#$TEMPLATE_CACHE_DIR#g" \
121
        -e "s#__TEMPLATE_CACHE_DIR__#$TEMPLATE_CACHE_DIR#g" \
Lines 407-412 PASSWDFILE="/etc/koha/passwd" Link Here
407
USE_MEMCACHED="no"
410
USE_MEMCACHED="no"
408
MEMCACHED_SERVERS=""
411
MEMCACHED_SERVERS=""
409
MEMCACHED_PREFIX=""
412
MEMCACHED_PREFIX=""
413
# elasticsearch config
414
ELASTICSEARCH_SERVER="localhost:9200"
410
# hardcoded memcached defaults
415
# hardcoded memcached defaults
411
DEFAULT_MEMCACHED_SERVERS="127.0.0.1:11211"
416
DEFAULT_MEMCACHED_SERVERS="127.0.0.1:11211"
412
DEFAULT_MEMCACHED_PREFIX="koha_"
417
DEFAULT_MEMCACHED_PREFIX="koha_"
Lines 444-450 fi Link Here
444
449
445
[ $# -ge 1 ] && [ $# -le 16 ] || ( usage ; die "Error: wrong parameters" )
450
[ $# -ge 1 ] && [ $# -le 16 ] || ( usage ; die "Error: wrong parameters" )
446
451
447
TEMP=`getopt -o chrpm:l:d:f:b:a: -l create-db,request-db,populate-db,use-db,use-memcached,enable-sru,sru-port:,help,marcflavor:,auth-idx:,biblio-idx:,zebralang:,defaultsql:,configfile:,passwdfile:,dbhost:,database:,adminuser:,memcached-servers:,memcached-prefix:,template-cache-dir:,upload-path:,letsencrypt, \
452
TEMP=`getopt -o chrpm:l:d:f:b:a: -l create-db,request-db,populate-db,use-db,use-memcached,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:,upload-path:,letsencrypt, \
448
     -n "$0" -- "$@"`
453
     -n "$0" -- "$@"`
449
454
450
# Note the quotes around `$TEMP': they are essential!
455
# Note the quotes around `$TEMP': they are essential!
Lines 459-464 CLO_BIBLIOS_INDEXING_MODE="" Link Here
459
CLO_AUTHORITIES_INDEXING_MODE=""
464
CLO_AUTHORITIES_INDEXING_MODE=""
460
CLO_MEMCACHED_SERVERS=""
465
CLO_MEMCACHED_SERVERS=""
461
CLO_MEMCACHED_PREFIX=""
466
CLO_MEMCACHED_PREFIX=""
467
CLO_ELASTICSEARCH_SERVER=""
462
CLO_UPLOAD_PATH=""
468
CLO_UPLOAD_PATH=""
463
CLO_LETSENCRYPT=""
469
CLO_LETSENCRYPT=""
464
CLO_TEMPLATE_CACHE_DIR=""
470
CLO_TEMPLATE_CACHE_DIR=""
Lines 479-484 while true ; do Link Here
479
            CLO_MEMCACHED_SERVERS="$2" ; shift 2 ;;
485
            CLO_MEMCACHED_SERVERS="$2" ; shift 2 ;;
480
        --memcached-prefix)
486
        --memcached-prefix)
481
            CLO_MEMCACHED_PREFIX="$2" ; shift 2;;
487
            CLO_MEMCACHED_PREFIX="$2" ; shift 2;;
488
        --elasticsearch-server)
489
            CLO_ELASTICSEARCH_SERVER="$2" ; shift 2 ;;
482
        -m|--marcflavor)
490
        -m|--marcflavor)
483
            CLO_ZEBRA_MARC_FORMAT="$2" ; shift 2 ;;
491
            CLO_ZEBRA_MARC_FORMAT="$2" ; shift 2 ;;
484
        -l|--zebralang)
492
        -l|--zebralang)
Lines 551-556 then Link Here
551
    PASSWDFILE="$CLO_PASSWDFILE"
559
    PASSWDFILE="$CLO_PASSWDFILE"
552
fi
560
fi
553
561
562
if [ "${CLO_ELASTICSEARCH_SERVER}" != "" ]; then
563
    ELASTICSEARCH_SERVER="${CLO_ELASTICSEARCH_SERVER}"
564
fi
565
554
if [ "$CLO_BIBLIOS_INDEXING_MODE" !=  "" ]; then
566
if [ "$CLO_BIBLIOS_INDEXING_MODE" !=  "" ]; then
555
    BIBLIOS_INDEXING_MODE=$CLO_BIBLIOS_INDEXING_MODE
567
    BIBLIOS_INDEXING_MODE=$CLO_BIBLIOS_INDEXING_MODE
556
fi
568
fi
(-)a/debian/templates/koha-conf-site.xml.in (-2 / +1 lines)
Lines 320-326 __END_SRU_PUBLICSERVER__ Link Here
320
 <plack_workers>2</plack_workers>
320
 <plack_workers>2</plack_workers>
321
321
322
 <elasticsearch>
322
 <elasticsearch>
323
     <server>localhost:9200</server>
323
     <server>__ELASTICSEARCH_SERVER__</server>
324
     <index_name>koha___KOHASITE__</index_name>
324
     <index_name>koha___KOHASITE__</index_name>
325
 </elasticsearch>
325
 </elasticsearch>
326
326
327
- 

Return to bug 19465