From ce7505de460a13121bd4b609d77908e500ee253f Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@geeklabor.de>
Date: Sat, 5 Oct 2019 13:53:22 +0200
Subject: [PATCH] test patched postgres connection options

---
 CHANGELOG.md                          | 1 +
 Dockerfile.linux.amd64                | 1 +
 overlay/etc/templates/config.php.tmpl | 1 +
 overlay/usr/local/bin/entrypoint.sh   | 6 +-----
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f009c61..1e4a45e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,4 @@
 * ENHANCEMENT
   * remove stdout redirect for the supercronic main process
   * remove log redirect from cron scripts
+  * add new env variable `FRESHRSS_DB_CONNECTION_URI_PARAMS`
diff --git a/Dockerfile.linux.amd64 b/Dockerfile.linux.amd64
index 81f4ab3..78468de 100644
--- a/Dockerfile.linux.amd64
+++ b/Dockerfile.linux.amd64
@@ -19,6 +19,7 @@ RUN apk --update add --virtual .build-deps tar curl && \
     mkdir -p /var/www/app && \
     mkdir /var/www/.postgresql && \
     curl -SsL ${FRESHRSS_TARBALL} | tar xz -C /var/www/app/ --strip-components=1 && \
+    curl -SsL -o /var/www/app/lib/Minz/ModelPdo.php https://raw.githubusercontent.com/FreshRSS/FreshRSS/f1173f96c44e776a44f927933db4e4eb46776bd6/lib/Minz/ModelPdo.php && \
     curl -SsL -o /etc/php7/browscap.ini https://browscap.org/stream?q=Lite_PHP_BrowsCapINI && \
     apk del .build-deps && \
     rm -rf /var/cache/apk/* && \
diff --git a/overlay/etc/templates/config.php.tmpl b/overlay/etc/templates/config.php.tmpl
index 5098bd2..f7f8185 100644
--- a/overlay/etc/templates/config.php.tmpl
+++ b/overlay/etc/templates/config.php.tmpl
@@ -60,6 +60,7 @@ return array(
         'password' => '{{ getenv "FRESHRSS_DB_PASSWORD" }}',
         'base' => '{{ getenv "FRESHRSS_DB_BASE" }}',
         'prefix' => '{{ getenv "FRESHRSS_DB_PREFIX" "freshrss_" }}',
+        'connection_uri_params' => '{{ getenv "FRESHRSS_DB_CONNECTION_URI_PARAMS" }}',
         'pdo_options' => array(),
 
     ),
diff --git a/overlay/usr/local/bin/entrypoint.sh b/overlay/usr/local/bin/entrypoint.sh
index b14618e..cec773a 100755
--- a/overlay/usr/local/bin/entrypoint.sh
+++ b/overlay/usr/local/bin/entrypoint.sh
@@ -4,10 +4,6 @@
 /usr/local/bin/gomplate -V -o /var/www/app/data/config.php -f /etc/templates/config.php.tmpl
 /usr/local/bin/gomplate -V -o /var/www/app/constants.local.php -f /etc/templates/constants.local.php.tmpl
 
-if [ "${FRESHRSS_POSTGRES_SSL_ROOTCERT}" ] && [ ! -f "/var/www/.postgresql/root.crt" ]; then
-    ln -s "${FRESHRSS_POSTGRES_SSL_ROOTCERT}" /var/www/.postgresql/root.crt
-fi
-
 printf "\nPrepare FreshRSS...\n"
 PREP=$(/usr/bin/php -f ./cli/prepare.php)
 if [ $? -ne 0 ]; then
@@ -27,7 +23,7 @@ if [ "${FRESHRSS_DEFAULT_USER}" ]; then
           ;;
         esac
     fi 
-    echo "Result: success"
+    printf "Result: success\n\n"
 fi
 
 if [ -f "/var/www/app/data/do-install.txt" ]; then