Version 1.5.1

https://github.com/FreshRSS/FreshRSS/issues/2233

CHANGELOG

@@ -88,3 +88,6 @@
 * Fix security issue where root directory was exposed
 * Enable mod rewrite for mobile apps like FeedMe to work
 
+[1.5.1]
+* Update FreshRSS to 1.13.1
+

CloudronManifest.json

@@ -5,7 +5,7 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "RSS feed reader",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "healthCheckPath": "/",
   "httpPort": 8000,
   "addons": {

DESCRIPTION.md

@@ -1,4 +1,4 @@
-This app packages FreshRSS <upstream>1.13.0</upstream>.
+This app packages FreshRSS <upstream>1.13.1</upstream>.
 
 FreshRSS is a self-hosted RSS feed aggregator such as Leed or Kriss Feed.
 

Dockerfile

@@ -3,15 +3,18 @@ FROM cloudron/base:1.0.0@sha256:147a648a068a2e746644746bbfb42eb7a50d682437cead3c
 RUN mkdir -p /app/code
 WORKDIR /app/code
 
-RUN curl -L https://github.com/FreshRSS/FreshRSS/archive/1.13.0.tar.gz | tar -zxvf - --strip-components=1
+RUN curl -L https://github.com/FreshRSS/FreshRSS/archive/1.13.1.tar.gz | tar -zxvf - --strip-components=1
 
 RUN mv data data-orig && ln -s /app/data data
 
 # official extensions
-RUN wget https://github.com/FreshRSS/Extensions/archive/2d0358e75961cbfcac7c2cbe09b098905ff67803.tar.gz -O - | tar -xz --strip-components=1 -C /app/code/extensions && \
+RUN wget https://github.com/FreshRSS/Extensions/archive/d7f025d9dd4d6322a18783db3c0cec4f8b1cc291.tar.gz -O - | tar -xz --strip-components=1 -C /app/code/extensions && \
     mv /app/code/extensions /app/code/extensions-orig && \
     ln -s /app/data/extensions /app/code/extensions
 
+# https://github.com/FreshRSS/FreshRSS/issues/2233
+RUN sed -e "s/SetEnvIf/SetEnvIfNoCase/" -i /app/code/p/api/.htaccess
+
 # configure apache
 RUN rm /etc/apache2/sites-enabled/*
 RUN sed -e 's,^ErrorLog.*,ErrorLog "|/bin/cat",' -i /etc/apache2/apache2.conf
@@ -21,7 +24,7 @@ RUN a2disconf other-vhosts-access-log
 ADD apache/freshrss.conf /etc/apache2/sites-enabled/freshrss.conf
 RUN echo "Listen 8000" > /etc/apache2/ports.conf
 
-RUN a2enmod headers expires deflate mime dir rewrite
+RUN a2enmod headers expires deflate mime dir rewrite setenvif
 
 RUN rm -rf /var/lib/php \
     && ln -s /run/php /var/lib/php \

test/test.js

@@ -153,8 +153,10 @@ describe('Application life cycle test', function () {
     }
 
     function checkApiConfiguration(callback) {
-        browser.get(`${baseUrl()}/api/greader.php/check%2Fcompatibility`).then(function () {
-            return exists(by.xpath('//pre[text()="PASS"]'));
+        browser.get(`${baseUrl()}/api/`).then(function () {
+            return exists(by.xpath('//dd[@id="greaderOutput" and contains(text(), "PASS")]'));
+        }).then(function () {
+            return exists(by.xpath('//dd[@id="feverOutput" and contains(text(), "PASS")]'));
         }).then(function () {
             callback();
         });
@@ -242,7 +244,7 @@ describe('Application life cycle test', function () {
     });
 
     it('can get app information', getAppInfo);
-    it('can login', login.bind(null, 'password'));
+    it('can login', login.bind(null, password));
     it('can subscribe', addSubscription);
     it('can add users', addUser.bind(null, password));
 
@@ -253,7 +255,7 @@ describe('Application life cycle test', function () {
         expect(app).to.be.an('object');
     });
 
-    it('can login', login.bind(null, 'password'));
+    it('can login', login.bind(null, password));
     it('subscription exists', subscriptionExists);
     it('can get static extension file', getStaticExtensionFile);