Attachment #86584 for bug #22508

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




  --upload-path dir         Set a user defined upload_path. It defaults to
                            /var/lib/koha/<instance>/uploads
  --upload-public-path dir  Set a user defined upload_public_path.
  --upload_public_url url   Set a user defined upload_public_url.
  --tmp-path dir            Set a user defined tmp_path. It defaults to
                            /var/lib/koha/<instance>/tmp
  --letsencrypt             Set up a https-only site with letsencrypt certificates

        -e "s#__TIMEZONE__#$TIMEZONE#g" \
        -e "s#__UPLOAD_PATH__#$UPLOAD_PATH#g" \
        -e "s#__UPLOAD_PUBLIC_PATH__#$UPLOAD_PUBLIC_PATH#g" \
        -e "s#__UPLOAD_PUBLIC_URL__#$UPLOAD_PUBLIC_URL#g" \
        -e "s#__TMP_PATH__#$TMP_PATH#g" \
        -e "s/__LOG_DIR__/\/var\/log\/koha\/$name/g" \
        -e "s/__PLUGINS_DIR__/\/var\/lib\/koha\/$name\/plugins/g" \

    fi
}

set_upload_public_url()
{
    local instance="$1"

    if [ "$CLO_UPLOAD_PUBLIC_URL" != "" ]; then
        UPLOAD_PUBLIC_URL=$CLO_UPLOAD_PUBLIC_URL
    fi
}

set_tmp_path()
{

CLO_MEMCACHED_PREFIX=""
CLO_UPLOAD_PATH=""
CLO_UPLOAD_PUBLIC_PATH=""
CLO_UPLOAD_PUBLIC_DIR=""
CLO_TMP_PATH=""
CLO_LETSENCRYPT=""
CLO_TEMPLATE_CACHE_DIR=""

            CLO_UPLOAD_PATH="$2" ; shift 2 ;;
        --upload-public-path)
            CLO_UPLOAD_PUBLIC_PATH="$2" ; shift 2 ;;
        --upload-public-url)
            CLO_UPLOAD_PUBLIC_URL="$2" ; shift 2 ;;
        --tmp-path)
            CLO_TMP_PATH="$2" ; shift 2 ;;
        --letsencrypt)

Lines 277-282 __END_SRU_PUBLICSERVER__ Link Here

(-)a/debian/templates/koha-conf-site.xml.in (+1 lines)
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	<upload_public_path>__UPLOAD_PUBLIC_PATH__</upload_public_path>
		280	<upload_public_url>__UPLOAD_PUBLIC_URL__</upload_public_url>
280	<tmp_path>__TMP_PATH__</tmp_path>	281	<tmp_path>__TMP_PATH__</tmp_path>
281	<intranetdir>/usr/share/koha/intranet/cgi-bin</intranetdir>	282	<intranetdir>/usr/share/koha/intranet/cgi-bin</intranetdir>
282	<opacdir>/usr/share/koha/opac/cgi-bin/opac</opacdir>	283	<opacdir>/usr/share/koha/opac/cgi-bin/opac</opacdir>

Lines 94-99 __PAZPAR2_TOGGLE_XML_POST__ Link Here

(-)a/etc/koha-conf.xml (-1 / +1 lines)
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	<upload_public_path></upload_public_path>
		97	<upload_public_url></upload_public_url>
97	<tmp_path></tmp_path>	98	<tmp_path></tmp_path>
98	<intranetdir>__INTRANET_CGI_DIR__</intranetdir>	99	<intranetdir>__INTRANET_CGI_DIR__</intranetdir>
99	<opacdir>__OPAC_CGI_DIR__/opac</opacdir>	100	<opacdir>__OPAC_CGI_DIR__/opac</opacdir>
100	-

Return to bug 22508

Lines 71-76 Options: Link Here

(-)a/debian/scripts/koha-create (+13 lines)
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	--upload-public-path dir Set a user defined upload_public_path.
		74	--upload_public_url url Set a user defined upload_public_url.
74	--tmp-path dir Set a user defined tmp_path. It defaults to	75	--tmp-path dir Set a user defined tmp_path. It defaults to
75	/var/lib/koha/<instance>/tmp	76	/var/lib/koha/<instance>/tmp
76	--letsencrypt Set up a https-only site with letsencrypt certificates	77	--letsencrypt Set up a https-only site with letsencrypt certificates
Lines 110-115 generate_config_file() { Link Here
110	-e "s#__TIMEZONE__#$TIMEZONE#g" \	111	-e "s#__TIMEZONE__#$TIMEZONE#g" \
111	-e "s#__UPLOAD_PATH__#$UPLOAD_PATH#g" \	112	-e "s#__UPLOAD_PATH__#$UPLOAD_PATH#g" \
112	-e "s#__UPLOAD_PUBLIC_PATH__#$UPLOAD_PUBLIC_PATH#g" \	113	-e "s#__UPLOAD_PUBLIC_PATH__#$UPLOAD_PUBLIC_PATH#g" \
		114	-e "s#__UPLOAD_PUBLIC_URL__#$UPLOAD_PUBLIC_URL#g" \
113	-e "s#__TMP_PATH__#$TMP_PATH#g" \	115	-e "s#__TMP_PATH__#$TMP_PATH#g" \
114	-e "s/__LOG_DIR__/\/var\/log\/koha\/$name/g" \	116	-e "s/__LOG_DIR__/\/var\/log\/koha\/$name/g" \
115	-e "s/__PLUGINS_DIR__/\/var\/lib\/koha\/$name\/plugins/g" \	117	-e "s/__PLUGINS_DIR__/\/var\/lib\/koha\/$name\/plugins/g" \
Lines 261-266 set_upload_public_path() Link Here
261	fi	263	fi
262	}	264	}
263		265
		266	set_upload_public_url()
		267	{
		268	local instance="$1"
		269
		270	if [ "$CLO_UPLOAD_PUBLIC_URL" != "" ]; then
		271	UPLOAD_PUBLIC_URL=$CLO_UPLOAD_PUBLIC_URL
		272	fi
		273	}
264		274
265	set_tmp_path()	275	set_tmp_path()
266	{	276	{
Lines 400-405 CLO_MEMCACHED_SERVERS="" Link Here
400	CLO_MEMCACHED_PREFIX=""	410	CLO_MEMCACHED_PREFIX=""
401	CLO_UPLOAD_PATH=""	411	CLO_UPLOAD_PATH=""
402	CLO_UPLOAD_PUBLIC_PATH=""	412	CLO_UPLOAD_PUBLIC_PATH=""
		413	CLO_UPLOAD_PUBLIC_DIR=""
403	CLO_TMP_PATH=""	414	CLO_TMP_PATH=""
404	CLO_LETSENCRYPT=""	415	CLO_LETSENCRYPT=""
405	CLO_TEMPLATE_CACHE_DIR=""	416	CLO_TEMPLATE_CACHE_DIR=""
Lines 447-452 while true ; do Link Here
447	CLO_UPLOAD_PATH="$2" ; shift 2 ;;	458	CLO_UPLOAD_PATH="$2" ; shift 2 ;;
448	--upload-public-path)	459	--upload-public-path)
449	CLO_UPLOAD_PUBLIC_PATH="$2" ; shift 2 ;;	460	CLO_UPLOAD_PUBLIC_PATH="$2" ; shift 2 ;;
		461	--upload-public-url)
		462	CLO_UPLOAD_PUBLIC_URL="$2" ; shift 2 ;;
450	--tmp-path)	463	--tmp-path)
451	CLO_TMP_PATH="$2" ; shift 2 ;;	464	CLO_TMP_PATH="$2" ; shift 2 ;;
452	--letsencrypt)	465	--letsencrypt)