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

(-)a/debian/docs/koha-create.xml (+9 lines)
Lines 42-47 Link Here
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>--timezone</option> time/zone</arg>
44
      <arg><option>--upload-path</option> directory</arg>
44
      <arg><option>--upload-path</option> directory</arg>
45
      <arg><option>--upload-tmp-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>
47
48
Lines 201-206 Link Here
201
      </listitem>
202
      </listitem>
202
    </varlistentry>
203
    </varlistentry>
203
204
205
    <varlistentry>
206
      <term><option>--upload-tmp-path</option></term>
207
      <listitem>
208
        <para>Specify a <option>directory</option> for storing the temporarily uploaded files of the instance.
209
              It defaults to <filename>/var/lib/koha/instance/uploads_tmp</filename>.</para>
210
      </listitem>
211
    </varlistentry>
212
204
    <varlistentry>
213
    <varlistentry>
205
      <term><option>--letsencrypt</option></term>
214
      <term><option>--letsencrypt</option></term>
206
      <listitem>
215
      <listitem>
(-)a/debian/scripts/koha-create (+21 lines)
Lines 74-79 Options: Link Here
74
  --timezone time/zone      Specify a timezone. e.g. America/Argentina
74
  --timezone time/zone      Specify a timezone. e.g. America/Argentina
75
  --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
76
                            /var/lib/koha/<instance>/uploads
76
                            /var/lib/koha/<instance>/uploads
77
  --upload-tmp-path dir     Set a user defined upload_tmp_path. It defaults to
78
                            /var/lib/koha/<instance>/uploads_tmp
77
  --letsencrypt             Set up a https-only site with letsencrypt certificates
79
  --letsencrypt             Set up a https-only site with letsencrypt certificates
78
  --help,-h                 Show this help.
80
  --help,-h                 Show this help.
79
81
Lines 118-123 generate_config_file() { Link Here
118
        -e "s#__TEMPLATE_CACHE_DIR__#$TEMPLATE_CACHE_DIR#g" \
120
        -e "s#__TEMPLATE_CACHE_DIR__#$TEMPLATE_CACHE_DIR#g" \
119
        -e "s#__TIMEZONE__#$TIMEZONE#g" \
121
        -e "s#__TIMEZONE__#$TIMEZONE#g" \
120
        -e "s#__UPLOAD_PATH__#$UPLOAD_PATH#g" \
122
        -e "s#__UPLOAD_PATH__#$UPLOAD_PATH#g" \
123
        -e "s#__UPLOAD_TMP_PATH__#$UPLOAD_TMP_PATH#g" \
121
        -e "s/__LOG_DIR__/\/var\/log\/koha\/$name/g" \
124
        -e "s/__LOG_DIR__/\/var\/log\/koha\/$name/g" \
122
        -e "s/__PLUGINS_DIR__/\/var\/lib\/koha\/$name\/plugins/g" \
125
        -e "s/__PLUGINS_DIR__/\/var\/lib\/koha\/$name\/plugins/g" \
123
        -e "s/__MEMCACHED_NAMESPACE__/$MEMCACHED_NAMESPACE/g" \
126
        -e "s/__MEMCACHED_NAMESPACE__/$MEMCACHED_NAMESPACE/g" \
Lines 329-334 set_upload_path() Link Here
329
    fi
332
    fi
330
}
333
}
331
334
335
set_upload_tmp_path()
336
{
337
    local instance="$1"
338
339
    if [ "$CLO_UPLOAD_TMP_PATH" != "" ]; then
340
        UPLOAD_TMP_PATH=$CLO_UPLOAD_TMP_PATH
341
    else
342
        UPLOAD_TMP_PATH="$UPLOAD_PATH_BASE/$instance/$UPLOAD_TMP_DIR"
343
    fi
344
}
345
332
enable_sru_server()
346
enable_sru_server()
333
{
347
{
334
    # remove the commenting symbols
348
    # remove the commenting symbols
Lines 417-422 UPLOAD_DIR="uploads" Link Here
417
UPLOAD_PATH=""
431
UPLOAD_PATH=""
418
# timezone defaults to empty
432
# timezone defaults to empty
419
TIMEZONE=""
433
TIMEZONE=""
434
# hardcoded upload_tmp_path
435
UPLOAD_TMP_DIR="uploads_tmp"
436
UPLOAD_TMP_PATH=""
420
# cache base dir
437
# cache base dir
421
CACHE_DIR_BASE="/var/cache/koha"
438
CACHE_DIR_BASE="/var/cache/koha"
422
# Generate a randomizaed API secret
439
# Generate a randomizaed API secret
Lines 463-468 CLO_AUTHORITIES_INDEXING_MODE="" Link Here
463
CLO_MEMCACHED_SERVERS=""
480
CLO_MEMCACHED_SERVERS=""
464
CLO_MEMCACHED_PREFIX=""
481
CLO_MEMCACHED_PREFIX=""
465
CLO_UPLOAD_PATH=""
482
CLO_UPLOAD_PATH=""
483
CLO_UPLOAD_TMP_PATH=""
466
CLO_LETSENCRYPT=""
484
CLO_LETSENCRYPT=""
467
CLO_TEMPLATE_CACHE_DIR=""
485
CLO_TEMPLATE_CACHE_DIR=""
468
CLO_TIMEZONE=""
486
CLO_TIMEZONE=""
Lines 511-516 while true ; do Link Here
511
            CLO_TIMEZONE="$2" ; shift 2 ;;
529
            CLO_TIMEZONE="$2" ; shift 2 ;;
512
        --upload-path)
530
        --upload-path)
513
            CLO_UPLOAD_PATH="$2" ; shift 2 ;;
531
            CLO_UPLOAD_PATH="$2" ; shift 2 ;;
532
        --upload-tmp-path)
533
            CLO_UPLOAD_TMP_PATH="$2" ; shift 2 ;;
514
        --letsencrypt)
534
        --letsencrypt)
515
            CLO_LETSENCRYPT="yes" ; shift ;;
535
            CLO_LETSENCRYPT="yes" ; shift ;;
516
        -h|--help)
536
        -h|--help)
Lines 580-585 set_authorities_indexing_mode $AUTHORITIES_INDEXING_MODE $ZEBRA_MARC_FORMAT Link Here
580
name="$1"
600
name="$1"
581
601
582
set_upload_path $name
602
set_upload_path $name
603
set_upload_tmp_path $name
583
604
584
if [ "$op" = use ] && [ "$CLO_DATABASE" = "" ] &&
605
if [ "$op" = use ] && [ "$CLO_DATABASE" = "" ] &&
585
   ( [ ! -f "$PASSWDFILE" ] || [ ! `cat $PASSWDFILE | grep "^$name:"` ] )
606
   ( [ ! -f "$PASSWDFILE" ] || [ ! `cat $PASSWDFILE | grep "^$name:"` ] )
(-)a/debian/scripts/koha-create-dirs (+1 lines)
Lines 55-60 do Link Here
55
    userdir "$name" "/var/lib/koha/$name/biblios/tmp"
55
    userdir "$name" "/var/lib/koha/$name/biblios/tmp"
56
    userdir "$name" "/var/lib/koha/$name/plugins"
56
    userdir "$name" "/var/lib/koha/$name/plugins"
57
    userdir "$name" "/var/lib/koha/$name/uploads"
57
    userdir "$name" "/var/lib/koha/$name/uploads"
58
    userdir "$name" "/var/lib/koha/$name/uploads_tmp"
58
    userdir "$name" "/var/lock/koha/$name"
59
    userdir "$name" "/var/lock/koha/$name"
59
    userdir "$name" "/var/lock/koha/$name/authorities"
60
    userdir "$name" "/var/lock/koha/$name/authorities"
60
    userdir "$name" "/var/lock/koha/$name/biblios"
61
    userdir "$name" "/var/lock/koha/$name/biblios"
(-)a/debian/templates/koha-conf-site.xml.in (+1 lines)
Lines 261-266 __END_SRU_PUBLICSERVER__ Link Here
261
 <pluginsdir>__PLUGINS_DIR__</pluginsdir> <!-- This entry can be repeated to use multiple directories -->
261
 <pluginsdir>__PLUGINS_DIR__</pluginsdir> <!-- This entry can be repeated to use multiple directories -->
262
 <enable_plugins>0</enable_plugins>
262
 <enable_plugins>0</enable_plugins>
263
 <upload_path>__UPLOAD_PATH__</upload_path>
263
 <upload_path>__UPLOAD_PATH__</upload_path>
264
 <upload_tmp_path>__UPLOAD_TMP_PATH__</upload_tmp_path>
264
 <intranetdir>/usr/share/koha/intranet/cgi-bin</intranetdir>
265
 <intranetdir>/usr/share/koha/intranet/cgi-bin</intranetdir>
265
 <opacdir>/usr/share/koha/opac/cgi-bin/opac</opacdir>
266
 <opacdir>/usr/share/koha/opac/cgi-bin/opac</opacdir>
266
 <opachtdocs>/usr/share/koha/opac/htdocs/opac-tmpl</opachtdocs>
267
 <opachtdocs>/usr/share/koha/opac/htdocs/opac-tmpl</opachtdocs>
(-)a/etc/koha-conf.xml (-1 / +1 lines)
Lines 93-98 __PAZPAR2_TOGGLE_XML_POST__ Link Here
93
 <pluginsdir>__PLUGINS_DIR__</pluginsdir> <!-- This entry can be repeated to use multiple directories -->
93
 <pluginsdir>__PLUGINS_DIR__</pluginsdir> <!-- This entry can be repeated to use multiple directories -->
94
 <enable_plugins>0</enable_plugins>
94
 <enable_plugins>0</enable_plugins>
95
 <upload_path></upload_path>
95
 <upload_path></upload_path>
96
 <upload_tmp_path></upload_tmp_path>
96
 <intranetdir>__INTRANET_CGI_DIR__</intranetdir>
97
 <intranetdir>__INTRANET_CGI_DIR__</intranetdir>
97
 <opacdir>__OPAC_CGI_DIR__/opac</opacdir>
98
 <opacdir>__OPAC_CGI_DIR__/opac</opacdir>
98
 <opachtdocs>__OPAC_TMPL_DIR__</opachtdocs>
99
 <opachtdocs>__OPAC_TMPL_DIR__</opachtdocs>
99
- 

Return to bug 20428