From e0f778c3c95a48fb6e497cd986fc5f77a1eb30e2 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Wed, 13 Mar 2019 10:11:09 -0300
Subject: [PATCH] Bug 22508: Add upload_public_url to config

Signed-off-by: Hugo Agud <hagud@orex.es>
---
 debian/scripts/koha-create             | 13 +++++++++++++
 debian/templates/koha-conf-site.xml.in |  1 +
 etc/koha-conf.xml                      |  1 +
 3 files changed, 15 insertions(+)

diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create
index 61a6aa9a9c..dca03efb23 100755
--- a/debian/scripts/koha-create
+++ b/debian/scripts/koha-create
@@ -71,6 +71,7 @@ Options:
   --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
@@ -110,6 +111,7 @@ generate_config_file() {
         -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" \
@@ -261,6 +263,14 @@ set_upload_public_path()
     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()
 {
@@ -400,6 +410,7 @@ CLO_MEMCACHED_SERVERS=""
 CLO_MEMCACHED_PREFIX=""
 CLO_UPLOAD_PATH=""
 CLO_UPLOAD_PUBLIC_PATH=""
+CLO_UPLOAD_PUBLIC_DIR=""
 CLO_TMP_PATH=""
 CLO_LETSENCRYPT=""
 CLO_TEMPLATE_CACHE_DIR=""
@@ -447,6 +458,8 @@ while true ; do
             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)
diff --git a/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in
index 603ebafa6b..8defc72ac2 100644
--- a/debian/templates/koha-conf-site.xml.in
+++ b/debian/templates/koha-conf-site.xml.in
@@ -277,6 +277,7 @@ __END_SRU_PUBLICSERVER__
  <enable_plugins>0</enable_plugins>
  <upload_path>__UPLOAD_PATH__</upload_path>
  <upload_public_path>__UPLOAD_PUBLIC_PATH__</upload_public_path>
+ <upload_public_url>__UPLOAD_PUBLIC_URL__</upload_public_url>
  <tmp_path>__TMP_PATH__</tmp_path>
  <intranetdir>/usr/share/koha/intranet/cgi-bin</intranetdir>
  <opacdir>/usr/share/koha/opac/cgi-bin/opac</opacdir>
diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml
index ab062d8a0f..93e46ab60d 100644
--- a/etc/koha-conf.xml
+++ b/etc/koha-conf.xml
@@ -94,6 +94,7 @@ __PAZPAR2_TOGGLE_XML_POST__
  <enable_plugins>0</enable_plugins>
  <upload_path></upload_path>
  <upload_public_path></upload_public_path>
+ <upload_public_url></upload_public_url>
  <tmp_path></tmp_path>
  <intranetdir>__INTRANET_CGI_DIR__</intranetdir>
  <opacdir>__OPAC_CGI_DIR__/opac</opacdir>
-- 
2.11.0