From ce862ea55d555becd908a66a6330b97dac1c6409 Mon Sep 17 00:00:00 2001
From: admire <admire@kartoza.com>
Date: Tue, 5 Jan 2021 15:46:47 +0200
Subject: [PATCH] Include extra config and fix wget in gdal install

---
 base_build/gdal_install.sh | 2 +-
 scripts/setup-conf.sh      | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/base_build/gdal_install.sh b/base_build/gdal_install.sh
index c2551f7..50f9590 100644
--- a/base_build/gdal_install.sh
+++ b/base_build/gdal_install.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 if [[ ${IMAGE_VERSION} =~ [Bb][Uu][Ll][Ll][Ss][Ee][Yy][Ee] ]]; then
-  wget http://ftp.br.debian.org/debian/pool/main/g/gdal/libgdal27_3.1.4+dfsg-1+b1_amd64.deb
+  wget --progress=bar:force:noscroll -c --no-check-certificate http://ftp.br.debian.org/debian/pool/main/g/gdal/libgdal27_3.1.4+dfsg-1+b1_amd64.deb
   dpkg -i libgdal27_3.1.4+dfsg-1+b1_amd64.deb
 fi
 
diff --git a/scripts/setup-conf.sh b/scripts/setup-conf.sh
index 81d5a17..d8e8f3a 100644
--- a/scripts/setup-conf.sh
+++ b/scripts/setup-conf.sh
@@ -82,7 +82,14 @@ EOF
 echo "include 'streaming_replication.conf'" >> $CONF
 fi
 
-echo -e $EXTRA_CONF >> $CONF
+if [[  -f ${ROOT_CONF}/extra.conf ]];then
+    rm $CONF/extra.conf
+fi
+
+if [[  ! -z $EXTRA_CONF ]]; then
+  echo -e $EXTRA_CONF >> ${ROOT_CONF}/extra.conf
+  echo "include 'extra.conf'" >> $CONF
+fi
 
 # Optimise PostgreSQL shared memory for PostGIS
 # shmall units are pages and shmmax units are bytes(?) equivalent to the desired shared_buffer size set in setup_conf.sh - in this case 500MB