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

(-)a/debian/docs/koha-create.xml (+8 lines)
Lines 40-45 Link Here
40
      <arg><option>--enable-sru</option></arg>
40
      <arg><option>--enable-sru</option></arg>
41
      <arg><option>--sru-port</option> port</arg>
41
      <arg><option>--sru-port</option> port</arg>
42
      <arg><option>--template-cache-dir</option> directory</arg>
42
      <arg><option>--template-cache-dir</option> directory</arg>
43
      <arg><option>--timezone</option> time/zone</arg>
43
      <arg><option>--upload-path</option> directory</arg>
44
      <arg><option>--upload-path</option> directory</arg>
44
      <arg><option>--letsencrypt</option></arg>
45
      <arg><option>--letsencrypt</option></arg>
45
      <arg><option>--help</option>|<option>-h</option></arg>
46
      <arg><option>--help</option>|<option>-h</option></arg>
Lines 185-190 Link Here
185
      </listitem>
186
      </listitem>
186
    </varlistentry>
187
    </varlistentry>
187
188
189
    <varlistentry>
190
      <term><option>--timezone</option></term>
191
      <listitem>
192
        <para>Specify a <option>timezone</option> for the created instance. e.g. America/Argentina</para>
193
      </listitem>
194
    </varlistentry>
195
188
    <varlistentry>
196
    <varlistentry>
189
      <term><option>--upload-path</option></term>
197
      <term><option>--upload-path</option></term>
190
      <listitem>
198
      <listitem>
(-)a/debian/scripts/koha-create (-1 / +12 lines)
Lines 71-76 Options: Link Here
71
                            conjunction with --defaultsql and --populate-db.
71
                            conjunction with --defaultsql and --populate-db.
72
  --template-cache-dir      Set a user defined template_cache_dir. It defaults to
72
  --template-cache-dir      Set a user defined template_cache_dir. It defaults to
73
                            /var/cache/koha/<instance>/templates
73
                            /var/cache/koha/<instance>/templates
74
  --timezone time/zone      Specify a timezone. e.g. America/Argentina
74
  --upload-path dir         Set a user defined upload_path. It defaults to
75
  --upload-path dir         Set a user defined upload_path. It defaults to
75
                            /var/lib/koha/<instance>/uploads
76
                            /var/lib/koha/<instance>/uploads
76
  --letsencrypt             Set up a https-only site with letsencrypt certificates
77
  --letsencrypt             Set up a https-only site with letsencrypt certificates
Lines 115-120 generate_config_file() { Link Here
115
        -e "s/__UNIXUSER__/$username/g" \
116
        -e "s/__UNIXUSER__/$username/g" \
116
        -e "s/__UNIXGROUP__/$username/g" \
117
        -e "s/__UNIXGROUP__/$username/g" \
117
        -e "s#__TEMPLATE_CACHE_DIR__#$TEMPLATE_CACHE_DIR#g" \
118
        -e "s#__TEMPLATE_CACHE_DIR__#$TEMPLATE_CACHE_DIR#g" \
119
        -e "s#__TIMEZONE__#$TIMEZONE#g" \
118
        -e "s#__UPLOAD_PATH__#$UPLOAD_PATH#g" \
120
        -e "s#__UPLOAD_PATH__#$UPLOAD_PATH#g" \
119
        -e "s/__LOG_DIR__/\/var\/log\/koha\/$name/g" \
121
        -e "s/__LOG_DIR__/\/var\/log\/koha\/$name/g" \
120
        -e "s/__PLUGINS_DIR__/\/var\/lib\/koha\/$name\/plugins/g" \
122
        -e "s/__PLUGINS_DIR__/\/var\/lib\/koha\/$name\/plugins/g" \
Lines 413-418 DEFAULT_MEMCACHED_PREFIX="koha_" Link Here
413
UPLOAD_PATH_BASE="/var/lib/koha"
415
UPLOAD_PATH_BASE="/var/lib/koha"
414
UPLOAD_DIR="uploads"
416
UPLOAD_DIR="uploads"
415
UPLOAD_PATH=""
417
UPLOAD_PATH=""
418
# timezone defaults to empty
419
TIMEZONE=""
416
# cache base dir
420
# cache base dir
417
CACHE_DIR_BASE="/var/cache/koha"
421
CACHE_DIR_BASE="/var/cache/koha"
418
# Generate a randomizaed API secret
422
# Generate a randomizaed API secret
Lines 443-449 fi Link Here
443
447
444
[ $# -ge 1 ] && [ $# -le 16 ] || ( usage ; die "Error: wrong parameters" )
448
[ $# -ge 1 ] && [ $# -le 16 ] || ( usage ; die "Error: wrong parameters" )
445
449
446
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:,upload-path:,letsencrypt, \
450
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:,letsencrypt, \
447
     -n "$0" -- "$@"`
451
     -n "$0" -- "$@"`
448
452
449
# Note the quotes around `$TEMP': they are essential!
453
# Note the quotes around `$TEMP': they are essential!
Lines 461-466 CLO_MEMCACHED_PREFIX="" Link Here
461
CLO_UPLOAD_PATH=""
465
CLO_UPLOAD_PATH=""
462
CLO_LETSENCRYPT=""
466
CLO_LETSENCRYPT=""
463
CLO_TEMPLATE_CACHE_DIR=""
467
CLO_TEMPLATE_CACHE_DIR=""
468
CLO_TIMEZONE=""
464
469
465
while true ; do
470
while true ; do
466
    case "$1" in
471
    case "$1" in
Lines 502-507 while true ; do Link Here
502
            SRU_SERVER_PORT="$2" ; shift 2 ;;
507
            SRU_SERVER_PORT="$2" ; shift 2 ;;
503
        --template-cache-dir)
508
        --template-cache-dir)
504
            CLO_TEMPLATE_CACHE_DIR="$2" ; shift 2 ;;
509
            CLO_TEMPLATE_CACHE_DIR="$2" ; shift 2 ;;
510
        --timezone)
511
            CLO_TIMEZONE="$2" ; shift 2 ;;
505
        --upload-path)
512
        --upload-path)
506
            CLO_UPLOAD_PATH="$2" ; shift 2 ;;
513
            CLO_UPLOAD_PATH="$2" ; shift 2 ;;
507
        --letsencrypt)
514
        --letsencrypt)
Lines 548-553 then Link Here
548
    PASSWDFILE="$CLO_PASSWDFILE"
555
    PASSWDFILE="$CLO_PASSWDFILE"
549
fi
556
fi
550
557
558
if [ "$CLO_TIMEZONE" != "" ]; then
559
    TIMEZONE=$CLO_TIMEZONE
560
fi
561
551
if [ "$CLO_BIBLIOS_INDEXING_MODE" !=  "" ]; then
562
if [ "$CLO_BIBLIOS_INDEXING_MODE" !=  "" ]; then
552
    BIBLIOS_INDEXING_MODE=$CLO_BIBLIOS_INDEXING_MODE
563
    BIBLIOS_INDEXING_MODE=$CLO_BIBLIOS_INDEXING_MODE
553
fi
564
fi
(-)a/debian/templates/koha-conf-site.xml.in (-2 / +1 lines)
Lines 367-373 __END_SRU_PUBLICSERVER__ Link Here
367
 <!-- The timezone setting can let you force the timezone for this
367
 <!-- The timezone setting can let you force the timezone for this
368
      instance to be something other then the local timezone of the
368
      instance to be something other then the local timezone of the
369
      server. e.g. Antarctica/South_Pole -->
369
      server. e.g. Antarctica/South_Pole -->
370
 <timezone></timezone>
370
 <timezone>__TIMEZONE__</timezone>
371
371
372
</config>
372
</config>
373
</yazgfs>
373
</yazgfs>
374
- 

Return to bug 20525