Bump version

CHANGELOG

@@ -165,36 +165,5 @@
 * Show users last activity date #2936
 * Ability to follow HTML redirections when retrieving full article content #2985
 
-[1.10.0]
+[1.9.2]
-* Add forum url and update screenshot links
+* Make p/api/ folder writeable for extensions like TinyTinyRSS api extension
-
-[1.11.0]
-* Update FreshRSS to 1.17.0
-* [Full changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.17.0)
-* New tag management page #3121
-* New page to add feeds and categories #3027
-* Add a way to disable/enable users #3056
-* Fix special characters in user queries #3037
-* Hide feed credentials when adding a new feed #3099
-* Trim whitespace for feed passwords #3158
-* 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.13.1",
+  "version": "1.9.2",
   "healthCheckPath": "/",
   "httpPort": 8000,
   "addons": {
@@ -14,7 +14,7 @@
     "scheduler": {
       "update_feeds": {
         "schedule": "*/1 * * * *",
-        "command": "echo '==> Run actualize script' && /usr/local/bin/gosu www-data:www-data php /app/code/app/actualize_script.php"
+        "command": "/usr/local/bin/gosu www-data:www-data php /app/code/app/actualize_script.php"
       }
     }
   },
@@ -22,12 +22,18 @@
   "website": "http://www.freshrss.org",
   "contactEmail": "support@cloudron.io",
   "icon": "logo.png",
-  "tags": [ "rss", "atom", "greader", "reader", "news", "feeds", "feedly" ],
+  "tags": [
+    "rss",
+    "atom",
+    "greader",
+    "reader",
+    "news",
+    "feeds"
+  ],
   "mediaLinks": [
-    "https://screenshots.cloudron.io/org.freshrss.cloudronapp/1.png"
+    "https://s3.amazonaws.com/cloudron-app-screenshots/org.freshrss.cloudronapp/7d731e71a6faa3791e19b7d7daf468a9486349cc/1.png"
   ],
   "postInstallMessage": "file://POSTINSTALL.md",
-  "minBoxVersion": "5.3.0",
+  "minBoxVersion": "2.0.0",
-  "forumUrl": "https://forum.cloudron.io/category/27/freshrss",
   "documentationUrl": "https://cloudron.io/documentation/apps/freshrss/"
 }

DESCRIPTION.md

@@ -1,4 +1,4 @@
-This app packages FreshRSS <upstream>1.18.0</upstream>.
+This app packages FreshRSS <upstream>1.16.2</upstream>.
 
 ## About
 
@@ -9,7 +9,6 @@ It is at the same time lightweight, easy to work with, powerful and customizable
 It is a multi-user application with an anonymous reading mode. It supports PubSubHubbub for instant notifications from compatible Web sites. There is an API for (mobile) clients, and a Command-Line Interface. Finally, it supports extensions for further tuning.
 
 ## Extensions
-
 FreshRSS supports further customizations by adding extensions on top of its core functionality.
 See the [repository dedicated to those extensions](https://github.com/FreshRSS/Extensions).
 

Dockerfile

@@ -1,17 +1,17 @@
-FROM cloudron/base:3.0.0@sha256:455c70428723e3a823198c57472785437eb6eab082e79b3ff04ea584faf46e92
+FROM cloudron/base:2.0.0@sha256:f9fea80513aa7c92fe2e7bf3978b54c8ac5222f47a9a32a7f8833edf0eb5a4f4
 
 RUN mkdir -p /app/code
 WORKDIR /app/code
 
-ARG VERSION=1.18.0
+ARG VERSION=1.16.2
 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
 
 # official extensions
-RUN wget https://github.com/FreshRSS/Extensions/archive/1784092164139dc6961ba5cc5b920331b586acbc.tar.gz -O - | tar -xz --strip-components=1 -C /app/code/extensions && \
+RUN wget https://github.com/FreshRSS/Extensions/archive/de83a1096c10644098291539cabfbecd38d5a28f.tar.gz -O - | tar -xz --strip-components=1 -C /app/code/extensions && \
-    mv /app/code/extensions /app/code/extensions-orig && \
+    mv /app/code/p/api /app/code/p-api-orig && ln -s /app/data/p-api /app/code/p/api && \
-    ln -s /app/data/extensions /app/code/extensions
+    mv /app/code/extensions /app/code/extensions-orig && ln -s /app/data/extensions /app/code/extensions
 
 # configure apache
 RUN rm /etc/apache2/sites-enabled/*
@@ -26,15 +26,12 @@ 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.4/apache2/php.ini PHP upload_max_filesize 64M && \
+RUN crudini --set /etc/php/7.3/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.3/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.3/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.3/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.3/apache2/php.ini Session session.gc_probability 1 && \
-    crudini --set /etc/php/7.4/apache2/php.ini Session session.gc_divisor 100
+    crudini --set /etc/php/7.3/apache2/php.ini Session session.gc_divisor 100
-
-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
 

POSTINSTALL.md

@@ -1,7 +1,10 @@
-This app is pre-setup with an admin account. The initial credentials are:
+This application does not integrate with Cloudron authentication.
-  
-**Username**: admin<br/>
-**Password**: changeme<br/>
 
-Please change the admin password immediately.
+There is a preconfigured administrator account with the following credentials:
 
+* Username: `admin`
+* Password: `changeme`
+
+(Please change that password on first login)
+
+You can create more accounts withing the app when logged in as administrator.

apache/freshrss.conf

@@ -1,12 +1,9 @@
-ServerName %{HTTP_HOST}
-
 <VirtualHost *:8000>
     DocumentRoot /app/code/p
     AllowEncodedSlashes On
 
-    LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" proxy
+    ErrorLog /dev/stderr 
-    CustomLog "|/bin/cat" proxy
+    CustomLog /dev/stdout combined
-    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	  10
+	MaxRequestWorkers	  6
 
     # Recycle process after handling these many requests. This protected against accidental memory leaks
 	MaxConnectionsPerChild   100

start.sh

@@ -18,10 +18,6 @@ if ! [ -f /app/data/.installed ]; then
     echo "==> Done."
 fi
 
-if [[ ! -f /app/data/php.ini ]]; then
-    echo -e "; Add custom PHP configuration in this file\n; Settings here are merged with the package's built-in php.ini\n\n" > /app/data/php.ini
-fi
-
 echo "==> Symlinking log file"
 rm -f /app/data/users/_/log_api.txt
 touch /tmp/log_api.txt
@@ -35,6 +31,13 @@ for f in $(ls /app/code/extensions-orig); do
     cp -r "/app/code/extensions-orig/$f" "/app/data/extensions"
 done
 
+echo "==> Copying extension p/api folder"
+mkdir -p /app/data/p-api
+for f in $(ls /app/code/p-api-orig); do
+    rm -rf "/app/data/p-api/$f"
+    cp -r "/app/code/p-api-orig/$f" "/app/data/p-api"
+done
+
 echo "==> Updating config file"
 php cli/reconfigure.php --default_user admin --base_url "https://${CLOUDRON_APP_DOMAIN}" \
     --db-type mysql --db-host "${CLOUDRON_MYSQL_HOST}" \

test/package.json

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

test/test.js

@@ -18,6 +18,9 @@ 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);
 
@@ -105,15 +108,14 @@ describe('Application life cycle test', function () {
     }
 
     function addSubscription(callback) {
-        var url = 'https://blog.cloudron.io/rss/';
+        var url = "https://cloudron.io/blog/rss.xml";
-        const addUrl = app.manifest.version === '1.10.0' ? `${baseUrl()}/i/?c=subscription` : `${baseUrl()}/i/?c=subscription&a=add`;
 
-        browser.get(addUrl).then(function () {
+        browser.get(`${baseUrl()}/i/?c=subscription`).then(function () {
             return visible(by.xpath('//input[@name="url_rss"]'));
         }).then(function () {
             return browser.findElement(by.xpath('//input[@name="url_rss"]')).sendKeys(url);
         }).then(function () {
-            return browser.findElement(by.xpath('//button[@type="submit"]/ancestor::form[@id="add_rss"]')).submit();
+            return browser.findElement(by.xpath('//form[@id="add_rss"]/div/button[@type="submit"]')).click();
         }).then(function () {
             return visible(by.xpath('//div[@id="notification" and @class="notification good"]'));
         }).then(function () {
@@ -167,7 +169,7 @@ describe('Application life cycle test', function () {
 
     function subscriptionExists(callback) {
         browser.get(`${baseUrl()}/i/?get=c_1`).then(function () {
-            return visible(by.xpath('//span[text()="Cloudron"]'));
+            return visible(by.xpath('//a[text()="Cloudron.io"]'));
         }).then(function () {
             callback();
         });
@@ -208,11 +210,7 @@ describe('Application life cycle test', function () {
     });
 
     it('restore app', function () {
-        const backups = JSON.parse(execSync('cloudron backup list --raw'));
+        execSync('cloudron restore --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-        execSync('cloudron uninstall --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-        execSync('cloudron install --location ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-        getAppInfo();
-        execSync(`cloudron restore --backup ${backups[0].id} --app ${app.id}`, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
     });
 
     it('can login', login.bind(null, password));