From aac9529e1234466fe4aef4786433ab9d4f30d9b9 Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@geeklabor.de>
Date: Thu, 3 Oct 2019 19:30:44 +0200
Subject: [PATCH] cleanup

---
 README.md                           |  2 +-
 overlay/etc/templates/php.ini.tmpl  |  2 +-
 overlay/usr/local/bin/entrypoint.sh | 14 --------------
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index b772774..07d8a65 100644
--- a/README.md
+++ b/README.md
@@ -122,7 +122,7 @@ PHP_REPORT_MEMLEAKS=On
 PHP_HTML_ERRORSOn
 PHP_ERROR_LOG=/proc/self/fd/2
 PHP_POST_MAX_SIZE=8M
-PHP_FILE_UPLOADS=Off
+PHP_FILE_UPLOADS=On
 PHP_UPLOAD_MAX_FILESIZE=2M
 PHP_MAX_FILE_UPLOADS=2
 PHP_ALLOW_URL_FOPEN=On
diff --git a/overlay/etc/templates/php.ini.tmpl b/overlay/etc/templates/php.ini.tmpl
index 1f62e7c..7b736e6 100644
--- a/overlay/etc/templates/php.ini.tmpl
+++ b/overlay/etc/templates/php.ini.tmpl
@@ -106,7 +106,7 @@ cgi.discard_path = 1
 ;cgi.rfc2616_headers = 0
 ;cgi.check_shebang_line = 1
 
-file_uploads = {{ getenv "PHP_FILE_UPLOADS" "Off" }}
+file_uploads = {{ getenv "PHP_FILE_UPLOADS" "On" }}
 upload_tmp_dir = /var/lib/php/tmp_upload
 upload_max_filesize = {{ getenv "PHP_UPLOAD_MAX_FILESIZE" "2M" }}
 max_file_uploads = {{ getenv "PHP_MAX_FILE_UPLOADS" "2" }}
diff --git a/overlay/usr/local/bin/entrypoint.sh b/overlay/usr/local/bin/entrypoint.sh
index d415fd9..ba40826 100755
--- a/overlay/usr/local/bin/entrypoint.sh
+++ b/overlay/usr/local/bin/entrypoint.sh
@@ -28,20 +28,6 @@ if [ "${FRESHRSS_DEFAULT_USER}" ]; then
         esac
     fi 
     echo "Result: success"
-
-#    printf "\nEnsure FreshRSS is installed...\n"
-#    INSTALL=$(/usr/bin/php ./cli/do-install.php --default_user "$FRESHRSS_DEFAULT_USER" 2>&1)
-#    if [ $? -ne 0 ]; then
-#        case "$INSTALL" in
-#          *"already installed"*) 
-#          /usr/bin/php ./cli/reconfigure.php --default_user "$FRESHRSS_DEFAULT_USER"
-#          ;;
-#          *)
-#          echo $INSTALL
-#          exit 1
-#          ;;
-#        esac
-#    fi
 fi
 
 if [ -f "/var/www/app/data/do-install.txt" ]; then