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

(-)a/debian/docs/koha-create.xml (+9 lines)
Lines 41-46 Link Here
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>--upload-path</option> directory</arg>
43
      <arg><option>--upload-path</option> directory</arg>
44
      <arg><option>--upload-tmp-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>
46
47
Lines 194-199 Link Here
194
    </varlistentry>
195
    </varlistentry>
195
196
196
    <varlistentry>
197
    <varlistentry>
198
      <term><option>--upload-tmp-path</option></term>
199
      <listitem>
200
        <para>Specify a <option>directory</option> for storing the temporarily uploaded files of the instance.
201
              It defaults to <filename>/var/lib/koha/instance/uploads_tmp</filename>.</para>
202
      </listitem>
203
    </varlistentry>
204
205
    <varlistentry>
197
      <term><option>--letsencrypt</option></term>
206
      <term><option>--letsencrypt</option></term>
198
      <listitem>
207
      <listitem>
199
        <para>Set up a https-only website with letsencrypt certificates</para>
208
        <para>Set up a https-only website with letsencrypt certificates</para>
(-)a/debian/scripts/koha-create (+21 lines)
Lines 73-78 Options: Link Here
73
                            /var/cache/koha/<instance>/templates
73
                            /var/cache/koha/<instance>/templates
74
  --upload-path dir         Set a user defined upload_path. It defaults to
74
  --upload-path dir         Set a user defined upload_path. It defaults to
75
                            /var/lib/koha/<instance>/uploads
75
                            /var/lib/koha/<instance>/uploads
76
  --upload-tmp-path dir     Set a user defined upload_tmp_path. It defaults to
77
                            /var/lib/koha/<instance>/uploads_tmp
76
  --letsencrypt             Set up a https-only site with letsencrypt certificates
78
  --letsencrypt             Set up a https-only site with letsencrypt certificates
77
  --help,-h                 Show this help.
79
  --help,-h                 Show this help.
78
80
Lines 116-121 generate_config_file() { Link Here
116
        -e "s/__UNIXGROUP__/$username/g" \
118
        -e "s/__UNIXGROUP__/$username/g" \
117
        -e "s#__TEMPLATE_CACHE_DIR__#$TEMPLATE_CACHE_DIR#g" \
119
        -e "s#__TEMPLATE_CACHE_DIR__#$TEMPLATE_CACHE_DIR#g" \
118
        -e "s#__UPLOAD_PATH__#$UPLOAD_PATH#g" \
120
        -e "s#__UPLOAD_PATH__#$UPLOAD_PATH#g" \
121
        -e "s#__UPLOAD_TMP_PATH__#$UPLOAD_TMP_PATH#g" \
119
        -e "s/__LOG_DIR__/\/var\/log\/koha\/$name/g" \
122
        -e "s/__LOG_DIR__/\/var\/log\/koha\/$name/g" \
120
        -e "s/__PLUGINS_DIR__/\/var\/lib\/koha\/$name\/plugins/g" \
123
        -e "s/__PLUGINS_DIR__/\/var\/lib\/koha\/$name\/plugins/g" \
121
        -e "s/__MEMCACHED_NAMESPACE__/$MEMCACHED_NAMESPACE/g" \
124
        -e "s/__MEMCACHED_NAMESPACE__/$MEMCACHED_NAMESPACE/g" \
Lines 327-332 set_upload_path() Link Here
327
    fi
330
    fi
328
}
331
}
329
332
333
set_upload_tmp_path()
334
{
335
    local instance="$1"
336
337
    if [ "$CLO_UPLOAD_TMP_PATH" != "" ]; then
338
        UPLOAD_TMP_PATH=$CLO_UPLOAD_TMP_PATH
339
    else
340
        UPLOAD_TMP_PATH="$UPLOAD_PATH_BASE/$instance/$UPLOAD_TMP_DIR"
341
    fi
342
}
343
330
enable_sru_server()
344
enable_sru_server()
331
{
345
{
332
    # remove the commenting symbols
346
    # remove the commenting symbols
Lines 413-418 DEFAULT_MEMCACHED_PREFIX="koha_" Link Here
413
UPLOAD_PATH_BASE="/var/lib/koha"
427
UPLOAD_PATH_BASE="/var/lib/koha"
414
UPLOAD_DIR="uploads"
428
UPLOAD_DIR="uploads"
415
UPLOAD_PATH=""
429
UPLOAD_PATH=""
430
# hardcoded upload_tmp_path
431
UPLOAD_TMP_DIR="uploads_tmp"
432
UPLOAD_TMP_PATH=""
416
# cache base dir
433
# cache base dir
417
CACHE_DIR_BASE="/var/cache/koha"
434
CACHE_DIR_BASE="/var/cache/koha"
418
# Generate a randomizaed API secret
435
# Generate a randomizaed API secret
Lines 459-464 CLO_AUTHORITIES_INDEXING_MODE="" Link Here
459
CLO_MEMCACHED_SERVERS=""
476
CLO_MEMCACHED_SERVERS=""
460
CLO_MEMCACHED_PREFIX=""
477
CLO_MEMCACHED_PREFIX=""
461
CLO_UPLOAD_PATH=""
478
CLO_UPLOAD_PATH=""
479
CLO_UPLOAD_TMP_PATH=""
462
CLO_LETSENCRYPT=""
480
CLO_LETSENCRYPT=""
463
CLO_TEMPLATE_CACHE_DIR=""
481
CLO_TEMPLATE_CACHE_DIR=""
464
482
Lines 504-509 while true ; do Link Here
504
            CLO_TEMPLATE_CACHE_DIR="$2" ; shift 2 ;;
522
            CLO_TEMPLATE_CACHE_DIR="$2" ; shift 2 ;;
505
        --upload-path)
523
        --upload-path)
506
            CLO_UPLOAD_PATH="$2" ; shift 2 ;;
524
            CLO_UPLOAD_PATH="$2" ; shift 2 ;;
525
        --upload-tmp-path)
526
            CLO_UPLOAD_TMP_PATH="$2" ; shift 2 ;;
507
        --letsencrypt)
527
        --letsencrypt)
508
            CLO_LETSENCRYPT="yes" ; shift ;;
528
            CLO_LETSENCRYPT="yes" ; shift ;;
509
        -h|--help)
529
        -h|--help)
Lines 569-574 set_authorities_indexing_mode $AUTHORITIES_INDEXING_MODE $ZEBRA_MARC_FORMAT Link Here
569
name="$1"
589
name="$1"
570
590
571
set_upload_path $name
591
set_upload_path $name
592
set_upload_tmp_path $name
572
593
573
if [ "$op" = use ] && [ "$CLO_DATABASE" = "" ] &&
594
if [ "$op" = use ] && [ "$CLO_DATABASE" = "" ] &&
574
   ( [ ! -f "$PASSWDFILE" ] || [ ! `cat $PASSWDFILE | grep "^$name:"` ] )
595
   ( [ ! -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