@@ -, +, @@
---
debian/docs/koha-create.xml | 9 +++++++++
debian/scripts/koha-create | 21 +++++++++++++++++++++
debian/scripts/koha-create-dirs | 1 +
debian/templates/koha-conf-site.xml.in | 1 +
etc/koha-conf.xml | 1 +
5 files changed, 33 insertions(+)
--- a/debian/docs/koha-create.xml
+++ a/debian/docs/koha-create.xml
@@ -41,6 +41,7 @@
port
directory
directory
+ directory
|
@@ -193,6 +194,14 @@
+
+
+
+ Specify a for storing the temporarily uploaded files of the instance.
+ It defaults to /var/lib/koha/instance/uploads_tmp.
+
+
+
--- a/debian/scripts/koha-create
+++ a/debian/scripts/koha-create
@@ -73,6 +73,8 @@ Options:
/var/cache/koha//templates
--upload-path dir Set a user defined upload_path. It defaults to
/var/lib/koha//uploads
+ --upload-tmp-path dir Set a user defined upload_tmp_path. It defaults to
+ /var/lib/koha//uploads_tmp
--letsencrypt Set up a https-only site with letsencrypt certificates
--help,-h Show this help.
@@ -116,6 +118,7 @@ generate_config_file() {
-e "s/__UNIXGROUP__/$username/g" \
-e "s#__TEMPLATE_CACHE_DIR__#$TEMPLATE_CACHE_DIR#g" \
-e "s#__UPLOAD_PATH__#$UPLOAD_PATH#g" \
+ -e "s#__UPLOAD_TMP_PATH__#$UPLOAD_TMP_PATH#g" \
-e "s/__LOG_DIR__/\/var\/log\/koha\/$name/g" \
-e "s/__PLUGINS_DIR__/\/var\/lib\/koha\/$name\/plugins/g" \
-e "s/__MEMCACHED_NAMESPACE__/$MEMCACHED_NAMESPACE/g" \
@@ -327,6 +330,17 @@ set_upload_path()
fi
}
+set_upload_tmp_path()
+{
+ local instance="$1"
+
+ if [ "$CLO_UPLOAD_TMP_PATH" != "" ]; then
+ UPLOAD_TMP_PATH=$CLO_UPLOAD_TMP_PATH
+ else
+ UPLOAD_TMP_PATH="$UPLOAD_PATH_BASE/$instance/$UPLOAD_TMP_DIR"
+ fi
+}
+
enable_sru_server()
{
# remove the commenting symbols
@@ -413,6 +427,9 @@ DEFAULT_MEMCACHED_PREFIX="koha_"
UPLOAD_PATH_BASE="/var/lib/koha"
UPLOAD_DIR="uploads"
UPLOAD_PATH=""
+# hardcoded upload_tmp_path
+UPLOAD_TMP_DIR="uploads_tmp"
+UPLOAD_TMP_PATH=""
# cache base dir
CACHE_DIR_BASE="/var/cache/koha"
# Generate a randomizaed API secret
@@ -459,6 +476,7 @@ CLO_AUTHORITIES_INDEXING_MODE=""
CLO_MEMCACHED_SERVERS=""
CLO_MEMCACHED_PREFIX=""
CLO_UPLOAD_PATH=""
+CLO_UPLOAD_TMP_PATH=""
CLO_LETSENCRYPT=""
CLO_TEMPLATE_CACHE_DIR=""
@@ -504,6 +522,8 @@ while true ; do
CLO_TEMPLATE_CACHE_DIR="$2" ; shift 2 ;;
--upload-path)
CLO_UPLOAD_PATH="$2" ; shift 2 ;;
+ --upload-tmp-path)
+ CLO_UPLOAD_TMP_PATH="$2" ; shift 2 ;;
--letsencrypt)
CLO_LETSENCRYPT="yes" ; shift ;;
-h|--help)
@@ -569,6 +589,7 @@ set_authorities_indexing_mode $AUTHORITIES_INDEXING_MODE $ZEBRA_MARC_FORMAT
name="$1"
set_upload_path $name
+set_upload_tmp_path $name
if [ "$op" = use ] && [ "$CLO_DATABASE" = "" ] &&
( [ ! -f "$PASSWDFILE" ] || [ ! `cat $PASSWDFILE | grep "^$name:"` ] )
--- a/debian/scripts/koha-create-dirs
+++ a/debian/scripts/koha-create-dirs
@@ -55,6 +55,7 @@ do
userdir "$name" "/var/lib/koha/$name/biblios/tmp"
userdir "$name" "/var/lib/koha/$name/plugins"
userdir "$name" "/var/lib/koha/$name/uploads"
+ userdir "$name" "/var/lib/koha/$name/uploads_tmp"
userdir "$name" "/var/lock/koha/$name"
userdir "$name" "/var/lock/koha/$name/authorities"
userdir "$name" "/var/lock/koha/$name/biblios"
--- a/debian/templates/koha-conf-site.xml.in
+++ a/debian/templates/koha-conf-site.xml.in
@@ -261,6 +261,7 @@ __END_SRU_PUBLICSERVER__
__PLUGINS_DIR__
0
__UPLOAD_PATH__
+ __UPLOAD_TMP_PATH__
/usr/share/koha/intranet/cgi-bin
/usr/share/koha/opac/cgi-bin/opac
/usr/share/koha/opac/htdocs/opac-tmpl
--- a/etc/koha-conf.xml
+++ a/etc/koha-conf.xml
@@ -93,6 +93,7 @@ __PAZPAR2_TOGGLE_XML_POST__
__PLUGINS_DIR__
0
+
__INTRANET_CGI_DIR__
__OPAC_CGI_DIR__/opac
__OPAC_TMPL_DIR__
--