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 111-116 generate_config_file() { Link Here
111
        -e "s/__DB_HOST__/$mysqlhost/g" \
113
        -e "s/__DB_HOST__/$mysqlhost/g" \
112
        -e "s/__DB_USER__/$mysqluser/g" \
114
        -e "s/__DB_USER__/$mysqluser/g" \
113
        -e "s/__DB_PASS__/$mysqlpwd/g" \
115
        -e "s/__DB_PASS__/$mysqlpwd/g" \
116
        -e "s/__ELASTICSEARCH_SERVER__/${ELASTICSEARCH_SERVER}/g" \
114
        -e "s/__UNIXUSER__/$username/g" \
117
        -e "s/__UNIXUSER__/$username/g" \
115
        -e "s/__UNIXGROUP__/$username/g" \
118
        -e "s/__UNIXGROUP__/$username/g" \
116
        -e "s#__UPLOAD_PATH__#$UPLOAD_PATH#g" \
119
        -e "s#__UPLOAD_PATH__#$UPLOAD_PATH#g" \
Lines 398-403 PASSWDFILE="/etc/koha/passwd" Link Here
398
USE_MEMCACHED="no"
401
USE_MEMCACHED="no"
399
MEMCACHED_SERVERS=""
402
MEMCACHED_SERVERS=""
400
MEMCACHED_PREFIX=""
403
MEMCACHED_PREFIX=""
404
# elasticsearch config
405
ELASTICSEARCH_SERVER="localhost:9200"
401
# hardcoded memcached defaults
406
# hardcoded memcached defaults
402
DEFAULT_MEMCACHED_SERVERS="127.0.0.1:11211"
407
DEFAULT_MEMCACHED_SERVERS="127.0.0.1:11211"
403
DEFAULT_MEMCACHED_PREFIX="koha_"
408
DEFAULT_MEMCACHED_PREFIX="koha_"
Lines 433-439 fi Link Here
433
438
434
[ $# -ge 1 ] && [ $# -le 16 ] || ( usage ; die "Error: wrong parameters" )
439
[ $# -ge 1 ] && [ $# -le 16 ] || ( usage ; die "Error: wrong parameters" )
435
440
436
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:,upload-path:,letsencrypt, \
441
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:,upload-path:,letsencrypt, \
437
     -n "$0" -- "$@"`
442
     -n "$0" -- "$@"`
438
443
439
# Note the quotes around `$TEMP': they are essential!
444
# Note the quotes around `$TEMP': they are essential!
Lines 448-453 CLO_BIBLIOS_INDEXING_MODE="" Link Here
448
CLO_AUTHORITIES_INDEXING_MODE=""
453
CLO_AUTHORITIES_INDEXING_MODE=""
449
CLO_MEMCACHED_SERVERS=""
454
CLO_MEMCACHED_SERVERS=""
450
CLO_MEMCACHED_PREFIX=""
455
CLO_MEMCACHED_PREFIX=""
456
CLO_ELASTICSEARCH_SERVER=""
451
CLO_UPLOAD_PATH=""
457
CLO_UPLOAD_PATH=""
452
CLO_LETSENCRYPT=""
458
CLO_LETSENCRYPT=""
453
459
Lines 467-472 while true ; do Link Here
467
            CLO_MEMCACHED_SERVERS="$2" ; shift 2 ;;
473
            CLO_MEMCACHED_SERVERS="$2" ; shift 2 ;;
468
        --memcached-prefix)
474
        --memcached-prefix)
469
            CLO_MEMCACHED_PREFIX="$2" ; shift 2;;
475
            CLO_MEMCACHED_PREFIX="$2" ; shift 2;;
476
        --elasticsearch-server)
477
            CLO_ELASTICSEARCH_SERVER="$2" ; shift 2 ;;
470
        -m|--marcflavor)
478
        -m|--marcflavor)
471
            CLO_ZEBRA_MARC_FORMAT="$2" ; shift 2 ;;
479
            CLO_ZEBRA_MARC_FORMAT="$2" ; shift 2 ;;
472
        -l|--zebralang)
480
        -l|--zebralang)
Lines 537-542 then Link Here
537
    PASSWDFILE="$CLO_PASSWDFILE"
545
    PASSWDFILE="$CLO_PASSWDFILE"
538
fi
546
fi
539
547
548
if [ "${CLO_ELASTICSEARCH_SERVER}" != "" ]; then
549
    ELASTICSEARCH_SERVER="${CLO_ELASTICSEARCH_SERVER}"
550
fi
551
540
if [ "$CLO_BIBLIOS_INDEXING_MODE" !=  "" ]; then
552
if [ "$CLO_BIBLIOS_INDEXING_MODE" !=  "" ]; then
541
    BIBLIOS_INDEXING_MODE=$CLO_BIBLIOS_INDEXING_MODE
553
    BIBLIOS_INDEXING_MODE=$CLO_BIBLIOS_INDEXING_MODE
542
fi
554
fi
(-)a/debian/templates/koha-conf-site.xml.in (-2 / +1 lines)
Lines 323-329 __END_SRU_PUBLICSERVER__ Link Here
323
 <plack_workers>2</plack_workers>
323
 <plack_workers>2</plack_workers>
324
324
325
 <elasticsearch>
325
 <elasticsearch>
326
     <server>localhost:9200</server>
326
     <server>__ELASTICSEARCH_SERVER__</server>
327
     <index_name>koha___KOHASITE__</index_name>
327
     <index_name>koha___KOHASITE__</index_name>
328
 </elasticsearch>
328
 </elasticsearch>
329
329
330
- 

Return to bug 19465