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

(-)a/debian/scripts/koha-create (-1 / +15 lines)
Lines 90-95 Options: Link Here
90
  --mb-pass pass            RabbitMQ password (default: guest)
90
  --mb-pass pass            RabbitMQ password (default: guest)
91
  --mb-vhost vhost          RabbitMQ vhost (default: koha_<instance>)
91
  --mb-vhost vhost          RabbitMQ vhost (default: koha_<instance>)
92
92
93
  --keep-cookie NAME        Do not clear this cookie at logout (can be repeated)
94
93
  --help,-h                 Show this help.
95
  --help,-h                 Show this help.
94
96
95
Note: the instance name cannot be longer that 11 chars.
97
Note: the instance name cannot be longer that 11 chars.
Lines 105-110 generate_config_file() { Link Here
105
    # Bug 28364: the z3950 responder needs other permissions
107
    # Bug 28364: the z3950 responder needs other permissions
106
    [ "$1" = "log4perl-site.conf.in" ] && chown "$username:$username" "$2"
108
    [ "$1" = "log4perl-site.conf.in" ] && chown "$username:$username" "$2"
107
109
110
    # Handle repeated command line options (KEEP_COOKIE)
111
    keep_cookie_lines=""
112
    for cookie in "${KEEP_COOKIE[@]}"
113
    do
114
        keep_cookie_lines="${keep_cookie_lines} <do_not_remove_cookie>${cookie}<\/do_not_remove_cookie>\\n"
115
    done
116
108
    chmod 0640 "$2"
117
    chmod 0640 "$2"
109
    sed -e "s/__KOHA_CONF_DIR__/\/etc\/koha\/sites\/$name/g" \
118
    sed -e "s/__KOHA_CONF_DIR__/\/etc\/koha\/sites\/$name/g" \
110
        -e "s/__KOHASITE__/$name/g" \
119
        -e "s/__KOHASITE__/$name/g" \
Lines 147-152 generate_config_file() { Link Here
147
        -e "s/__MESSAGE_BROKER_USER__/$MESSAGE_BROKER_USER/g" \
156
        -e "s/__MESSAGE_BROKER_USER__/$MESSAGE_BROKER_USER/g" \
148
        -e "s/__MESSAGE_BROKER_PASS__/$MESSAGE_BROKER_PASS/g" \
157
        -e "s/__MESSAGE_BROKER_PASS__/$MESSAGE_BROKER_PASS/g" \
149
        -e "s/__MESSAGE_BROKER_VHOST__/$MESSAGE_BROKER_VHOST/g" \
158
        -e "s/__MESSAGE_BROKER_VHOST__/$MESSAGE_BROKER_VHOST/g" \
159
        -e "s/ <do_not_remove_cookie>__KEEP_COOKIE__<\/do_not_remove_cookie>/$keep_cookie_lines/" \
150
        "/etc/koha/$1" > "$2"
160
        "/etc/koha/$1" > "$2"
151
161
152
}
162
}
Lines 475-480 END_SRU_PUBLICSERVER="-->" Link Here
475
485
476
APACHE_CONFIGFILE=""
486
APACHE_CONFIGFILE=""
477
487
488
declare -a KEEP_COOKIE
489
478
if [ -e /etc/koha/koha-sites.conf ]
490
if [ -e /etc/koha/koha-sites.conf ]
479
then
491
then
480
    . /etc/koha/koha-sites.conf
492
    . /etc/koha/koha-sites.conf
Lines 482-488 fi Link Here
482
494
483
[ $# -ge 1 ] && [ $# -le 16 ] || ( usage ; die "Error: wrong parameters" )
495
[ $# -ge 1 ] && [ $# -le 16 ] || ( usage ; die "Error: wrong parameters" )
484
496
485
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,mb-host:,mb-port:,mb-user:,mb-pass:,mb-vhost:,letsencrypt, \
497
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,mb-host:,mb-port:,mb-user:,mb-pass:,mb-vhost:,letsencrypt,keep-cookie:, \
486
     -n "$0" -- "$@"`
498
     -n "$0" -- "$@"`
487
499
488
# Note the quotes around `$TEMP': they are essential!
500
# Note the quotes around `$TEMP': they are essential!
Lines 549-554 while true ; do Link Here
549
            CLO_ADMINUSER="$2" ; shift 2 ;;
561
            CLO_ADMINUSER="$2" ; shift 2 ;;
550
        --enable-sru)
562
        --enable-sru)
551
            ENABLE_SRU="yes" ; shift ;;
563
            ENABLE_SRU="yes" ; shift ;;
564
        --keep-cookie)
565
            KEEP_COOKIE+=("$2"); shift 2;;
552
        --mb-host)
566
        --mb-host)
553
            CLO_MESSAGE_BROKER_HOST="$2" ; shift 2 ;;
567
            CLO_MESSAGE_BROKER_HOST="$2" ; shift 2 ;;
554
        --mb-port)
568
        --mb-port)
(-)a/debian/templates/koha-conf-site.xml.in (-1 / +1 lines)
Lines 449-454 __END_SRU_PUBLICSERVER__ Link Here
449
   <vhost>__MESSAGE_BROKER_VHOST__</vhost>
449
   <vhost>__MESSAGE_BROKER_VHOST__</vhost>
450
 </message_broker>
450
 </message_broker>
451
451
452
 <do_not_remove_cookie>__KEEP_COOKIE__</do_not_remove_cookie>
452
 <!-- Uncomment lines like hereunder to not clear cookies at logout:
453
 <!-- Uncomment lines like hereunder to not clear cookies at logout:
453
      The cookie name is case sensitive.
454
      The cookie name is case sensitive.
454
     <do_not_remove_cookie>KohaOpacLanguage</do_not_remove_cookie>
455
     <do_not_remove_cookie>KohaOpacLanguage</do_not_remove_cookie>
455
- 

Return to bug 29957