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

(-)a/debian/scripts/koha-create (+15 lines)
Lines 70-75 Options: Link Here
70
  --timezone time/zone      Specify a timezone. e.g. America/Argentina
70
  --timezone time/zone      Specify a timezone. e.g. America/Argentina
71
  --upload-path dir         Set a user defined upload_path. It defaults to
71
  --upload-path dir         Set a user defined upload_path. It defaults to
72
                            /var/lib/koha/<instance>/uploads
72
                            /var/lib/koha/<instance>/uploads
73
  --upload-public-path dir  Set a user defined upload_public_path.
73
  --tmp-path dir            Set a user defined tmp_path. It defaults to
74
  --tmp-path dir            Set a user defined tmp_path. It defaults to
74
                            /var/lib/koha/<instance>/tmp
75
                            /var/lib/koha/<instance>/tmp
75
  --letsencrypt             Set up a https-only site with letsencrypt certificates
76
  --letsencrypt             Set up a https-only site with letsencrypt certificates
Lines 108-113 generate_config_file() { Link Here
108
        -e "s#__TEMPLATE_CACHE_DIR__#$TEMPLATE_CACHE_DIR#g" \
109
        -e "s#__TEMPLATE_CACHE_DIR__#$TEMPLATE_CACHE_DIR#g" \
109
        -e "s#__TIMEZONE__#$TIMEZONE#g" \
110
        -e "s#__TIMEZONE__#$TIMEZONE#g" \
110
        -e "s#__UPLOAD_PATH__#$UPLOAD_PATH#g" \
111
        -e "s#__UPLOAD_PATH__#$UPLOAD_PATH#g" \
112
        -e "s#__UPLOAD_PUBLIC_PATH__#$UPLOAD_PUBLIC_PATH#g" \
111
        -e "s#__TMP_PATH__#$TMP_PATH#g" \
113
        -e "s#__TMP_PATH__#$TMP_PATH#g" \
112
        -e "s/__LOG_DIR__/\/var\/log\/koha\/$name/g" \
114
        -e "s/__LOG_DIR__/\/var\/log\/koha\/$name/g" \
113
        -e "s/__PLUGINS_DIR__/\/var\/lib\/koha\/$name\/plugins/g" \
115
        -e "s/__PLUGINS_DIR__/\/var\/lib\/koha\/$name\/plugins/g" \
Lines 250-255 set_upload_path() Link Here
250
    fi
252
    fi
251
}
253
}
252
254
255
set_upload_public_path()
256
{
257
    local instance="$1"
258
259
    if [ "$CLO_UPLOAD_PUBLIC_PATH" != "" ]; then
260
        UPLOAD_PUBLIC_PATH=$CLO_UPLOAD_PUBLIC_PATH
261
    fi
262
}
263
264
253
set_tmp_path()
265
set_tmp_path()
254
{
266
{
255
    local instance="$1"
267
    local instance="$1"
Lines 387-392 CLO_ADMINUSER="" Link Here
387
CLO_MEMCACHED_SERVERS=""
399
CLO_MEMCACHED_SERVERS=""
388
CLO_MEMCACHED_PREFIX=""
400
CLO_MEMCACHED_PREFIX=""
389
CLO_UPLOAD_PATH=""
401
CLO_UPLOAD_PATH=""
402
CLO_UPLOAD_PUBLIC_PATH=""
390
CLO_TMP_PATH=""
403
CLO_TMP_PATH=""
391
CLO_LETSENCRYPT=""
404
CLO_LETSENCRYPT=""
392
CLO_TEMPLATE_CACHE_DIR=""
405
CLO_TEMPLATE_CACHE_DIR=""
Lines 432-437 while true ; do Link Here
432
            CLO_TIMEZONE="$2" ; shift 2 ;;
445
            CLO_TIMEZONE="$2" ; shift 2 ;;
433
        --upload-path)
446
        --upload-path)
434
            CLO_UPLOAD_PATH="$2" ; shift 2 ;;
447
            CLO_UPLOAD_PATH="$2" ; shift 2 ;;
448
        --upload-public-path)
449
            CLO_UPLOAD_PUBLIC_PATH="$2" ; shift 2 ;;
435
        --tmp-path)
450
        --tmp-path)
436
            CLO_TMP_PATH="$2" ; shift 2 ;;
451
            CLO_TMP_PATH="$2" ; shift 2 ;;
437
        --letsencrypt)
452
        --letsencrypt)
(-)a/debian/templates/koha-conf-site.xml.in (+1 lines)
Lines 276-281 __END_SRU_PUBLICSERVER__ Link Here
276
 <pluginsdir>__PLUGINS_DIR__</pluginsdir> <!-- This entry can be repeated to use multiple directories -->
276
 <pluginsdir>__PLUGINS_DIR__</pluginsdir> <!-- This entry can be repeated to use multiple directories -->
277
 <enable_plugins>0</enable_plugins>
277
 <enable_plugins>0</enable_plugins>
278
 <upload_path>__UPLOAD_PATH__</upload_path>
278
 <upload_path>__UPLOAD_PATH__</upload_path>
279
 <upload_public_path>__UPLOAD_PUBLIC_PATH__</upload_public_path>
279
 <tmp_path>__TMP_PATH__</tmp_path>
280
 <tmp_path>__TMP_PATH__</tmp_path>
280
 <intranetdir>/usr/share/koha/intranet/cgi-bin</intranetdir>
281
 <intranetdir>/usr/share/koha/intranet/cgi-bin</intranetdir>
281
 <opacdir>/usr/share/koha/opac/cgi-bin/opac</opacdir>
282
 <opacdir>/usr/share/koha/opac/cgi-bin/opac</opacdir>
(-)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_public_path></upload_public_path>
96
 <tmp_path></tmp_path>
97
 <tmp_path></tmp_path>
97
 <intranetdir>__INTRANET_CGI_DIR__</intranetdir>
98
 <intranetdir>__INTRANET_CGI_DIR__</intranetdir>
98
 <opacdir>__OPAC_CGI_DIR__/opac</opacdir>
99
 <opacdir>__OPAC_CGI_DIR__/opac</opacdir>
99
- 

Return to bug 22508