From 497199febdb48f56894f8105e91aa03d592bdfdf Mon Sep 17 00:00:00 2001
From: Dennis Schwerdel <schwerdel@googlemail.com>
Date: Sun, 12 Mar 2017 10:45:14 +0100
Subject: [PATCH] Updated to 1.6.3, removed custom patches

---
 CHANGELOG                |  4 ++++
 CloudronManifest.json    |  2 +-
 Dockerfile               |  6 +-----
 remove-update-menu.patch | 24 ------------------------
 set_config.php           | 22 ----------------------
 start.sh                 | 12 ++++++++----
 6 files changed, 14 insertions(+), 56 deletions(-)
 delete mode 100644 remove-update-menu.patch
 delete mode 100644 set_config.php

diff --git a/CHANGELOG b/CHANGELOG
index 453fb81..1fc76b4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,3 +10,7 @@
 * Using cli scripts
 * Using scheduler for periodic task
 * Removed update menu item
+
+[0.4.0]
+* Updated to FreshRSS 1.6.3
+* Removed most custom patches (FreshRSS includes those now)
diff --git a/CloudronManifest.json b/CloudronManifest.json
index 8bd3964..b64242c 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -5,7 +5,7 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "RSS feed reader",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "healthCheckPath": "/",
   "httpPort": 8000,
   "addons": {
diff --git a/Dockerfile b/Dockerfile
index 05f7278..b32a7fc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ RUN apt-get update \
     && apt-get -y install php php-curl php-gmp php-intl php-mbstring php-xml php-zip \
        libapache2-mod-php mysql-client php-mysql
 
-ENV VERSION 1.6.2
+ENV VERSION 1.6.3
 ENV EXTENSIONS_VERSION eac4b749775c3e1b584c1a6b4a4487e4a4b8b159
 
 RUN mkdir -p /app/code
@@ -42,10 +42,6 @@ RUN rm /etc/apache2/sites-enabled/* \
 RUN rm -rf /var/lib/php \
     && ln -s /run/php /var/lib/php
 
-ADD remove-update-menu.patch /app/code/remove-update-menu.patch
-RUN patch -p0 -d /app/code < /app/code/remove-update-menu.patch
-
 ADD start.sh /app/code/start.sh
-ADD set_config.php /app/code/set_config.php
 
 CMD [ "/app/code/start.sh" ]
diff --git a/remove-update-menu.patch b/remove-update-menu.patch
deleted file mode 100644
index 122134f..0000000
--- a/remove-update-menu.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naru app-orig/layout/aside_configure.phtml app/layout/aside_configure.phtml
---- app-orig/layout/aside_configure.phtml	2016-12-26 15:33:47.000000000 +0000
-+++ app/layout/aside_configure.phtml	2017-02-23 14:48:10.214072522 +0000
-@@ -41,9 +41,5 @@
- 	                          Minz_Request::actionName() === 'checkInstall' ? ' active' : ''; ?>">
- 		<a href="<?php echo _url('update', 'checkInstall'); ?>"><?php echo _t('gen.menu.check_install'); ?></a>
- 	</li>
--	<li class="item<?php echo Minz_Request::controllerName() === 'update' &&
--	                          Minz_Request::actionName() === 'index' ? ' active' : ''; ?>">
--		<a href="<?php echo _url('update', 'index'); ?>"><?php echo _t('gen.menu.update'); ?></a>
--	</li>
- 	<?php } ?>
- </ul>
-diff -Naru app-orig/layout/header.phtml app/layout/header.phtml
---- app-orig/layout/header.phtml	2016-12-26 15:33:47.000000000 +0000
-+++ app/layout/header.phtml	2017-02-23 14:48:31.430114487 +0000
-@@ -71,7 +71,6 @@
- 				<li class="item"><a href="<?php echo _url('user', 'manage'); ?>"><?php echo _t('gen.menu.user_management'); ?></a></li>
- 				<li class="item"><a href="<?php echo _url('auth', 'index'); ?>"><?php echo _t('gen.menu.authentication'); ?></a></li>
- 				<li class="item"><a href="<?php echo _url('update', 'checkInstall'); ?>"><?php echo _t('gen.menu.check_install'); ?></a></li>
--				<li class="item"><a href="<?php echo _url('update', 'index'); ?>"><?php echo _t('gen.menu.update'); ?></a></li>
- 				<?php } ?>
- 				<li class="separator"></li>
- 				<li class="item"><a href="<?php echo _url('stats', 'index'); ?>"><?php echo _t('gen.menu.stats'); ?></a></li>
diff --git a/set_config.php b/set_config.php
deleted file mode 100644
index 93ac067..0000000
--- a/set_config.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-  $config = include("/app/data/config.php");
-
-  $config["default_user"] = "admin";
-  $config["base_url"] = "https://".getenv('APP_DOMAIN')."/p";
-  $config["db"] = array (
-    "type" => "mysql",
-    "host" => getenv('MYSQL_HOST'),
-    "user" => getenv('MYSQL_USERNAME'),
-    "password" => getenv('MYSQL_PASSWORD'),
-    "base" => getenv('MYSQL_DATABASE'),
-    "prefix" => "",
-    "pdo_options" => 
-    array (
-    )
-  );
-
-  $config_str = var_export($config, TRUE);
-  file_put_contents("/app/data/config.php", "<?php return $config_str;");
-
-?>
diff --git a/start.sh b/start.sh
index 0c18620..52fb4ec 100755
--- a/start.sh
+++ b/start.sh
@@ -11,8 +11,8 @@ if ! [ -f /app/data/.installed ]; then
     --environment production --default_user admin \
     --db-type mysql --db-host "${MYSQL_HOST}:${MYSQL_PORT}" \
     --db-user "${MYSQL_USERNAME}" --db-password "${MYSQL_PASSWORD}" \
-    --db-base "${MYSQL_DATABASE}" --db-prefix ""
-  php set_config.php # --db-prefix "" seems to be ignored
+    --db-base "${MYSQL_DATABASE}" --db-prefix "" \
+    --disable_update
   php cli/create-user.php --user admin --password password --language en
   php cli/actualize-user.php --user admin
   touch /app/data/.installed
@@ -27,8 +27,12 @@ for f in $(ls /app/code/extensions-orig); do
 done
 
 
-echo "Creating config file"
-php set_config.php
+echo "Updating config file"
+php cli/reconfigure.php --default_user admin --base_url "https://${APP_DOMAIN}/p" \
+    --db-type mysql --db-host "${MYSQL_HOST}:${MYSQL_PORT}" \
+    --db-user "${MYSQL_USERNAME}" --db-password "${MYSQL_PASSWORD}" \
+    --db-base "${MYSQL_DATABASE}" --db-prefix "" \
+    --disable_update
 
 
 echo "Setting permissions"