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

(-)a/debian/docs/koha-create.xml (+8 lines)
Lines 41-46 Link Here
41
      <arg><option>--enable-sru</option></arg>
41
      <arg><option>--enable-sru</option></arg>
42
      <arg><option>--sru-port</option> port</arg>
42
      <arg><option>--sru-port</option> port</arg>
43
      <arg><option>--template-cache-dir</option> directory</arg>
43
      <arg><option>--template-cache-dir</option> directory</arg>
44
      <arg><option>--timezone</option> time/zone</arg>
44
      <arg><option>--upload-path</option> directory</arg>
45
      <arg><option>--upload-path</option> directory</arg>
45
      <arg><option>--letsencrypt</option></arg>
46
      <arg><option>--letsencrypt</option></arg>
46
      <arg><option>--help</option>|<option>-h</option></arg>
47
      <arg><option>--help</option>|<option>-h</option></arg>
Lines 194-199 Link Here
194
    </varlistentry>
195
    </varlistentry>
195
196
196
    <varlistentry>
197
    <varlistentry>
198
      <term><option>--timezone</option></term>
199
      <listitem>
200
        <para>Specify a <option>timezone</option> for the created instance. e.g. America/Argentina</para>
201
      </listitem>
202
    </varlistentry>
203
204
    <varlistentry>
197
      <term><option>--upload-path</option></term>
205
      <term><option>--upload-path</option></term>
198
      <listitem>
206
      <listitem>
199
        <para>Specify a <option>directory</option> for storing the permanently uploaded files of the instance.
207
        <para>Specify a <option>directory</option> for storing the permanently uploaded files of the instance.
(-)a/debian/scripts/koha-create (-1 / +12 lines)
Lines 72-77 Options: Link Here
72
                            conjunction with --defaultsql and --populate-db.
72
                            conjunction with --defaultsql and --populate-db.
73
  --template-cache-dir      Set a user defined template_cache_dir. It defaults to
73
  --template-cache-dir      Set a user defined template_cache_dir. It defaults to
74
                            /var/cache/koha/<instance>/templates
74
                            /var/cache/koha/<instance>/templates
75
  --timezone time/zone      Specify a timezone. e.g. America/Argentina
75
  --upload-path dir         Set a user defined upload_path. It defaults to
76
  --upload-path dir         Set a user defined upload_path. It defaults to
76
                            /var/lib/koha/<instance>/uploads
77
                            /var/lib/koha/<instance>/uploads
77
  --letsencrypt             Set up a https-only site with letsencrypt certificates
78
  --letsencrypt             Set up a https-only site with letsencrypt certificates
Lines 116-121 generate_config_file() { Link Here
116
        -e "s/__UNIXUSER__/$username/g" \
117
        -e "s/__UNIXUSER__/$username/g" \
117
        -e "s/__UNIXGROUP__/$username/g" \
118
        -e "s/__UNIXGROUP__/$username/g" \
118
        -e "s#__TEMPLATE_CACHE_DIR__#$TEMPLATE_CACHE_DIR#g" \
119
        -e "s#__TEMPLATE_CACHE_DIR__#$TEMPLATE_CACHE_DIR#g" \
120
        -e "s#__TIMEZONE__#$TIMEZONE#g" \
119
        -e "s#__UPLOAD_PATH__#$UPLOAD_PATH#g" \
121
        -e "s#__UPLOAD_PATH__#$UPLOAD_PATH#g" \
120
        -e "s/__LOG_DIR__/\/var\/log\/koha\/$name/g" \
122
        -e "s/__LOG_DIR__/\/var\/log\/koha\/$name/g" \
121
        -e "s/__PLUGINS_DIR__/\/var\/lib\/koha\/$name\/plugins/g" \
123
        -e "s/__PLUGINS_DIR__/\/var\/lib\/koha\/$name\/plugins/g" \
Lines 414-419 DEFAULT_MEMCACHED_PREFIX="koha_" Link Here
414
UPLOAD_PATH_BASE="/var/lib/koha"
416
UPLOAD_PATH_BASE="/var/lib/koha"
415
UPLOAD_DIR="uploads"
417
UPLOAD_DIR="uploads"
416
UPLOAD_PATH=""
418
UPLOAD_PATH=""
419
# timezone defaults to empty
420
TIMEZONE=""
417
# cache base dir
421
# cache base dir
418
CACHE_DIR_BASE="/var/cache/koha"
422
CACHE_DIR_BASE="/var/cache/koha"
419
# Generate a randomizaed API secret
423
# Generate a randomizaed API secret
Lines 444-450 fi Link Here
444
448
445
[ $# -ge 1 ] && [ $# -le 16 ] || ( usage ; die "Error: wrong parameters" )
449
[ $# -ge 1 ] && [ $# -le 16 ] || ( usage ; die "Error: wrong parameters" )
446
450
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, \
451
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:,timezone:,upload-path:,letsencrypt, \
448
     -n "$0" -- "$@"`
452
     -n "$0" -- "$@"`
449
453
450
# Note the quotes around `$TEMP': they are essential!
454
# Note the quotes around `$TEMP': they are essential!
Lines 462-467 CLO_MEMCACHED_PREFIX="" Link Here
462
CLO_UPLOAD_PATH=""
466
CLO_UPLOAD_PATH=""
463
CLO_LETSENCRYPT=""
467
CLO_LETSENCRYPT=""
464
CLO_TEMPLATE_CACHE_DIR=""
468
CLO_TEMPLATE_CACHE_DIR=""
469
CLO_TIMEZONE=""
465
470
466
while true ; do
471
while true ; do
467
    case "$1" in
472
    case "$1" in
Lines 505-510 while true ; do Link Here
505
            SRU_SERVER_PORT="$2" ; shift 2 ;;
510
            SRU_SERVER_PORT="$2" ; shift 2 ;;
506
        --template-cache-dir)
511
        --template-cache-dir)
507
            CLO_TEMPLATE_CACHE_DIR="$2" ; shift 2 ;;
512
            CLO_TEMPLATE_CACHE_DIR="$2" ; shift 2 ;;
513
        --timezone)
514
            CLO_TIMEZONE="$2" ; shift 2 ;;
508
        --upload-path)
515
        --upload-path)
509
            CLO_UPLOAD_PATH="$2" ; shift 2 ;;
516
            CLO_UPLOAD_PATH="$2" ; shift 2 ;;
510
        --letsencrypt)
517
        --letsencrypt)
Lines 551-556 then Link Here
551
    PASSWDFILE="$CLO_PASSWDFILE"
558
    PASSWDFILE="$CLO_PASSWDFILE"
552
fi
559
fi
553
560
561
if [ "$CLO_TIMEZONE" != "" ]; then
562
    TIMEZONE=$CLO_TIMEZONE
563
fi
564
554
if [ "$CLO_BIBLIOS_INDEXING_MODE" !=  "" ]; then
565
if [ "$CLO_BIBLIOS_INDEXING_MODE" !=  "" ]; then
555
    BIBLIOS_INDEXING_MODE=$CLO_BIBLIOS_INDEXING_MODE
566
    BIBLIOS_INDEXING_MODE=$CLO_BIBLIOS_INDEXING_MODE
556
fi
567
fi
(-)a/debian/templates/koha-conf-site.xml.in (-2 / +1 lines)
Lines 359-365 __END_SRU_PUBLICSERVER__ Link Here
359
 <!-- The timezone setting can let you force the timezone for this
359
 <!-- The timezone setting can let you force the timezone for this
360
      instance to be something other then the local timezone of the
360
      instance to be something other then the local timezone of the
361
      server. e.g. Antarctica/South_Pole -->
361
      server. e.g. Antarctica/South_Pole -->
362
 <timezone></timezone>
362
 <timezone>__TIMEZONE__</timezone>
363
363
364
</config>
364
</config>
365
</yazgfs>
365
</yazgfs>
366
- 

Return to bug 20525