From 5d5eb1f633e28cdd003a33e1c546c89f9fafeca3 Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Thu, 18 Mar 2021 14:35:51 -0700
Subject: [PATCH] Version 1.13.0

---
 CHANGELOG               | 11 +++++++++++
 CloudronManifest.json   |  4 ++--
 DESCRIPTION.md          |  2 +-
 apache/mpm_prefork.conf |  2 +-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 4aff65e..caac1cc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -184,3 +184,14 @@
 * Update base image to v3
 * Update PHP to 7.4
 
+[1.13.0]
+* Update FreshRSS to 1.18.0
+* [Full changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.18.0)
+* Allow parallel requests #3096 - Much faster manual feeds refresh
+* Reload full article content when an article has changed #3506
+* New share article link to clipboard #3330
+* Improved OPML import of feeds with multiple categories #3286
+* Add a content action parameter to work with CSS selector #3453
+* New cURL options per feed: proxy, cookie, user-agent #3367, #3494, #3516
+* Do not import feeds causing database errors (e.g. due to conflicting HTTP redirections) ##3347
+
diff --git a/CloudronManifest.json b/CloudronManifest.json
index 5495762..76d7c35 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -5,7 +5,7 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "RSS feed reader",
-  "version": "1.12.0",
+  "version": "1.13.0",
   "healthCheckPath": "/",
   "httpPort": 8000,
   "addons": {
@@ -14,7 +14,7 @@
     "scheduler": {
       "update_feeds": {
         "schedule": "*/1 * * * *",
-        "command": "/usr/local/bin/gosu www-data:www-data php /app/code/app/actualize_script.php"
+        "command": "echo '==> Run actualize script' && /usr/local/bin/gosu www-data:www-data php /app/code/app/actualize_script.php"
       }
     }
   },
diff --git a/DESCRIPTION.md b/DESCRIPTION.md
index 9670180..1d1f83e 100644
--- a/DESCRIPTION.md
+++ b/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages FreshRSS <upstream>1.17.0</upstream>.
+This app packages FreshRSS <upstream>1.18.0</upstream>.
 
 ## About
 
diff --git a/apache/mpm_prefork.conf b/apache/mpm_prefork.conf
index c6fc22a..624c2e9 100644
--- a/apache/mpm_prefork.conf
+++ b/apache/mpm_prefork.conf
@@ -9,7 +9,7 @@
 	MaxSpareServers 3
 
     # Maximum number of servers at any given instant. Requests will be queued after this
-	MaxRequestWorkers	  6
+	MaxRequestWorkers	  10
 
     # Recycle process after handling these many requests. This protected against accidental memory leaks
 	MaxConnectionsPerChild   100