Version 1.13.1

CHANGELOG

@@ -180,3 +180,21 @@
 * Updated PHPMailer library to 6.1.6 #3024
 * Add blogger.com to the default list of forced HTTPS #3088
 
+[1.12.0]
+* 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
+
+[1.13.1]
+* Fix apache config to log the client IP
+

CloudronManifest.json

@@ -5,7 +5,7 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "RSS feed reader",
-  "version": "1.11.0",
+  "version": "1.13.1",
   "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"
       }
     }
   },

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
 

Dockerfile

@@ -1,9 +1,9 @@
-FROM cloudron/base:2.0.0@sha256:f9fea80513aa7c92fe2e7bf3978b54c8ac5222f47a9a32a7f8833edf0eb5a4f4
+FROM cloudron/base:3.0.0@sha256:455c70428723e3a823198c57472785437eb6eab082e79b3ff04ea584faf46e92
 
 RUN mkdir -p /app/code
 WORKDIR /app/code
 
-ARG VERSION=1.17.0
+ARG VERSION=1.18.0
 RUN curl -L https://github.com/FreshRSS/FreshRSS/archive/${VERSION}.tar.gz | tar -zxvf - --strip-components=1
 
 RUN mv data data-orig && ln -s /app/data data
@@ -26,15 +26,15 @@ RUN a2enmod headers expires deflate mime dir rewrite setenvif
 
 RUN rm -rf /var/lib/php && ln -s /run/php /var/lib/php
 
-RUN crudini --set /etc/php/7.3/apache2/php.ini PHP upload_max_filesize 64M && \
-    crudini --set /etc/php/7.3/apache2/php.ini PHP post_max_size 64M && \
-    crudini --set /etc/php/7.3/apache2/php.ini PHP memory_limit 64M && \
-    crudini --set /etc/php/7.3/apache2/php.ini Session session.save_path /run/php/session && \
-    crudini --set /etc/php/7.3/apache2/php.ini Session session.gc_probability 1 && \
-    crudini --set /etc/php/7.3/apache2/php.ini Session session.gc_divisor 100
+RUN crudini --set /etc/php/7.4/apache2/php.ini PHP upload_max_filesize 64M && \
+    crudini --set /etc/php/7.4/apache2/php.ini PHP post_max_size 64M && \
+    crudini --set /etc/php/7.4/apache2/php.ini PHP memory_limit 64M && \
+    crudini --set /etc/php/7.4/apache2/php.ini Session session.save_path /run/php/session && \
+    crudini --set /etc/php/7.4/apache2/php.ini Session session.gc_probability 1 && \
+    crudini --set /etc/php/7.4/apache2/php.ini Session session.gc_divisor 100
 
-RUN ln -s /app/data/php.ini /etc/php/7.3/apache2/conf.d/99-cloudron.ini && \
-    ln -s /app/data/php.ini /etc/php/7.3/cli/conf.d/99-cloudron.ini
+RUN ln -s /app/data/php.ini /etc/php/7.4/apache2/conf.d/99-cloudron.ini && \
+    ln -s /app/data/php.ini /etc/php/7.4/cli/conf.d/99-cloudron.ini
 
 ADD start.sh /app/code/start.sh
 

apache/freshrss.conf

@@ -1,9 +1,12 @@
+ServerName %{HTTP_HOST}
+
 <VirtualHost *:8000>
     DocumentRoot /app/code/p
     AllowEncodedSlashes On
 
-    ErrorLog /dev/stderr 
-    CustomLog /dev/stdout combined
+    LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" proxy
+    CustomLog "|/bin/cat" proxy
+    ErrorLog "|/bin/cat"
 
     <Directory /app/code/p/>
         Options +FollowSymLinks

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

test/package.json

@@ -9,14 +9,14 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "chromedriver": "^84.0.0",
-    "ejs": "^3.1.3",
+    "chromedriver": "^90.0.0",
+    "ejs": "^3.1.6",
     "expect.js": "^0.3.1",
     "mkdirp": "^1.0.4",
-    "mocha": "^8.0.1",
+    "mocha": "^8.4.0",
     "rimraf": "^3.0.2",
     "selenium-server-standalone-jar": "^3.141.59",
     "selenium-webdriver": "^3.6.0",
-    "superagent": "^5.3.1"
+    "superagent": "^6.1.0"
   }
 }

test/test.js

@@ -18,9 +18,6 @@ var by = webdriver.By,
 var username = 'admin',
     password = 'changeme';
 
-process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
-
-
 describe('Application life cycle test', function () {
     this.timeout(0);