Bump version and update to 0.10.2

CHANGELOG

@@ -36,20 +36,3 @@
 
 [0.9.0]
 * Update to FreshRSS 1.10.2
-
-[0.10.0]
-* Better apache configs
-* Update extensions
-
-[1.0.0]
-* Fix issue where static extension assets were not served
-
-[1.1.0]
-* Update FreshRSS to 1.11.0
-
-[1.1.1]
-* Update FreshRSS to to 1.11.1
-
-[1.1.2]
-* Update FreshRSS to 1.11.2
-

CloudronManifest.json

@@ -5,7 +5,7 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "RSS feed reader",
-  "version": "1.1.2",
+  "version": "0.9.0",
   "healthCheckPath": "/",
   "httpPort": 8000,
   "addons": {
@@ -33,7 +33,5 @@
   "mediaLinks": [
     "https://s3.amazonaws.com/cloudron-app-screenshots/org.freshrss.cloudronapp/7d731e71a6faa3791e19b7d7daf468a9486349cc/1.png"
   ],
-  "postInstallMessage": "file://POSTINSTALL.md",
+  "postInstallMessage": "file://POSTINSTALL.md"
-  "minBoxVersion": "2.0.0",
-  "documentationUrl": "https://cloudron.io/documentation/apps/freshrss/"
 }

DESCRIPTION.md

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

Dockerfile

@@ -4,28 +4,37 @@ 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.10.2
+ENV EXTENSIONS_VERSION a60a0ce5d0d864b5654a4d2609167d03c2299500
+
 RUN mkdir -p /app/code
 WORKDIR /app/code
 
-RUN curl -L https://github.com/FreshRSS/FreshRSS/archive/1.11.2.tar.gz | tar -zxvf - --strip-components=1
+RUN wget "https://github.com/FreshRSS/FreshRSS/archive/${VERSION}.tar.gz" -O - \
+    | tar -xz --strip-components=1
 
-RUN mv data data-orig && ln -s /app/data data
+RUN mkdir -p /app/data \
+    && mv data data-orig \
+    && ln -s /app/data data
 
-# official extensions
+ADD change-ttrss-file-path.patch /app/code/change-ttrss-file-path.patch
-RUN wget https://github.com/FreshRSS/Extensions/archive/2d0358e75961cbfcac7c2cbe09b098905ff67803.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
 
-# configure apache
+RUN wget https://github.com/FreshRSS/Extensions/archive/${EXTENSIONS_VERSION}.tar.gz -O - \
-RUN rm /etc/apache2/sites-enabled/*
+    | tar -xz --strip-components=1 -C /app/code/extensions \
-RUN sed -e 's,^ErrorLog.*,ErrorLog "|/bin/cat",' -i /etc/apache2/apache2.conf
+    && patch -p0 -d /app/code < /app/code/change-ttrss-file-path.patch \
-COPY apache/mpm_prefork.conf /etc/apache2/mods-available/mpm_prefork.conf
+    && mv /app/code/extensions /app/code/extensions-orig \
+    && ln -s /app/data/extensions /app/code/extensions \
+    && ln -s /app/data/extensions/ttrss.php /app/code/p/api/ttrss.php
 
-RUN a2disconf other-vhosts-access-log
+ADD apache2.conf /etc/apache2/sites-available/freshrss.conf
-ADD apache/freshrss.conf /etc/apache2/sites-enabled/freshrss.conf
-RUN echo "Listen 8000" > /etc/apache2/ports.conf
 
-RUN a2enmod headers expires
+RUN rm /etc/apache2/sites-enabled/* \
+    && sed -e 's,^ErrorLog.*,ErrorLog "/dev/stderr",' -i /etc/apache2/apache2.conf \
+    && sed -e "s,MaxSpareServers[^:].*,MaxSpareServers 5," -i /etc/apache2/mods-available/mpm_prefork.conf \
+    && a2disconf other-vhosts-access-log \
+    && echo "Listen 8000" > /etc/apache2/ports.conf \
+    && a2enmod headers expires \
+    && a2ensite freshrss
 
 RUN rm -rf /var/lib/php \
     && ln -s /run/php /var/lib/php \

apache/mpm_prefork.conf

@@ -1,17 +0,0 @@
-<IfModule mpm_prefork_module>
-    # On startup, start these many servers
-	StartServers	2
-
-    # At any given time, keep atleast these many servers
-	MinSpareServers	2
-
-    # At any given time, keep atmost these many idle servers (this is always >= MinSpareServers+1)
-	MaxSpareServers 3
-
-    # Maximum number of servers at any given instant. Requests will be queued after this
-	MaxRequestWorkers	  6
-
-    # Recycle process after handling these many requests. This protected against accidental memory leaks
-	MaxConnectionsPerChild   100
-</IfModule>
-

change-ttrss-file-path.patch

@@ -0,0 +1,21 @@
+diff -ru extensions-orig/xExtension-TTRSS_API/extension.php extensions/xExtension-TTRSS_API/extension.php
+--- extensions-orig/xExtension-TTRSS_API/extension.php	2016-12-15 10:24:17.000000000 +0000
++++ extensions/xExtension-TTRSS_API/extension.php	2017-02-18 13:06:59.640761922 +0000
+@@ -9,7 +9,7 @@
+ 	public function install() {
+ 		$filename = 'ttrss.php';
+ 		$file_source = join_path($this->getPath(), $filename);
+-		$path_destination = join_path(PUBLIC_PATH, 'api');
++		$path_destination = '/app/data/extensions';
+ 		$file_destination = join_path($path_destination, $filename);
+ 
+ 		if (!is_writable($path_destination)) {
+@@ -35,7 +35,7 @@
+ 
+ 	public function uninstall() {
+ 		$filename = 'ttrss.php';
+-		$file_destination = join_path(PUBLIC_PATH, 'api', $filename);
++		$file_destination = join_path('/app/data/extensions', $filename);
+ 
+ 		if (file_exists($file_destination) && !unlink($file_destination)) {
+ 			return 'API file cannot be removed';

start.sh

@@ -25,12 +25,13 @@ rm -f /app/data/users/_/log_api.txt
 touch /tmp/log_api.txt
 ln -s /tmp/log_api.txt /app/data/users/_/log_api.txt
 
-# We have to copy instead of symlinking extensions (see #2)
+
-echo "Copying packaged extensions"
+echo "Symlinking packaged extensions"
 mkdir -p /app/data/extensions
 for f in $(ls /app/code/extensions-orig); do
-    rm -rf "/app/data/extensions/$f"
+  if ! [ -e "/app/data/extensions/$f" ]; then
-    cp -r "/app/code/extensions-orig/$f" "/app/data/extensions"
+    ln -s "/app/code/extensions-orig/$f" "/app/data/extensions/$f"
+  fi
 done
 
 

test/package-lock.json

@@ -100,9 +100,9 @@
       "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
     },
     "chromedriver": {
-      "version": "2.38.3",
+      "version": "2.36.0",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-2.38.3.tgz",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-2.36.0.tgz",
-      "integrity": "sha512-tczy6RHl0LOVA4p+xezcu3NRjr9A1iLyyfjP9yPIUynvV28YSKH/Ll1iw0jMCjN9jwtaB2HB4aPjv0Uuw2VARw==",
+      "integrity": "sha512-Lq2HrigCJ4RVdIdCmchenv1rVrejNSJ7EUCQojycQo12ww3FedQx4nb+GgTdqMhjbOMTqq5+ziaiZlrEN2z1gQ==",
       "requires": {
         "del": "3.0.0",
         "extract-zip": "1.6.6",

test/package.json

@@ -9,7 +9,6 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "chromedriver": "^2.38.3",
     "ejs": "^2.4.2",
     "expect.js": "^0.3.1",
     "mkdirp": "^0.5.1",
@@ -17,6 +16,7 @@
     "rimraf": "^2.5.3",
     "selenium-server-standalone-jar": "^2.53.1",
     "selenium-webdriver": "^2.53.3",
-    "superagent": "^1.8.5"
+    "superagent": "^1.4.0",
+    "chromedriver": "^2.27.0"
   }
 }

test/test.js

@@ -2,12 +2,9 @@
 
 'use strict';
 
-require('chromedriver');
-
 var execSync = require('child_process').execSync,
     expect = require('expect.js'),
     path = require('path'),
-    superagent = require('superagent'),
     webdriver = require('selenium-webdriver');
 
 var by = webdriver.By,
@@ -45,83 +42,79 @@ describe('Application life cycle test', function () {
     var TEST_TIMEOUT = 10000;
     var app;
 
-    function exists(selector) {
+    function exists(selector, callback) {
-        return browser.wait(until.elementLocated(selector), TEST_TIMEOUT);
+        return browser.wait(until.elementLocated(selector), TEST_TIMEOUT).then(function () {
+            callback();
+        });
     }
 
     function visible(selector, callback) {
-        return exists(selector).then(function () {
+        exists(selector, function () {
-            return browser.wait(until.elementIsVisible(browser.findElement(selector)), TEST_TIMEOUT);
+            browser.wait(until.elementIsVisible(browser.findElement(selector)), TEST_TIMEOUT).then(function () {
+                callback();
+            });
         });
     }
 
     function login(callback) {
-        browser.manage().deleteAllCookies().then(function () {
+        browser.manage().deleteAllCookies();
-            return browser.get('https://' + app.fqdn);
+        browser.get('https://' + app.fqdn);
-        }).then(function () {
+
-            return visible(by.id('loginButton'));
+        visible(by.id('loginButton'), function () {
-        }).then(function () {
+            browser.findElement(by.id('username')).sendKeys(username);
-            return browser.findElement(by.id('username')).sendKeys(username);
+            browser.findElement(by.id('passwordPlain')).sendKeys(password);
-        }).then(function () {
+            browser.findElement(by.id('loginButton')).click();
-            return browser.findElement(by.id('passwordPlain')).sendKeys(password);
+            browser.wait(until.elementLocated(by.id('dropdown-configure')), TEST_TIMEOUT).then(function () { callback(); });
-        }).then(function () {
-            return browser.findElement(by.id('loginButton')).click();
-        }).then(function () {
-            return browser.wait(until.elementLocated(by.id('dropdown-configure')), TEST_TIMEOUT);
-        }).then(function () {
-            callback();
         });
     }
 
     function logout(callback) {
         var logout_btn = by.xpath('//ul[@class="dropdown-menu"]/li/a[@class="signout"]');
 
-        browser.get('https://' + app.fqdn).then(function () {
+        browser.get('https://' + app.fqdn);
-            return visible(by.id('stream'));
+
-        }).then(function () {
+        visible(by.id('stream'), function () {
-            return browser.findElement(by.className('dropdown-toggle')).click();
+            browser.findElement(by.className('dropdown-toggle')).click();
-        }).then(function () {
+            visible(logout_btn, function () {
-            return visible(logout_btn);
+                browser.findElement(logout_btn).click();
-        }).then(function () {
+
-            return browser.findElement(logout_btn).click();
+                browser.wait(until.elementLocated(by.id('loginButton')), TEST_TIMEOUT).then(function () { callback(); });
-        }).then(function () {
+            });
-            return browser.wait(until.elementLocated(by.id('loginButton')), TEST_TIMEOUT);
-        }).then(function () {
-            callback();
         });
     }
 
     function addSubscription(callback) {
         var url = "https://cloudron.io/blog/rss.xml";
 
-        browser.get(`https://${app.fqdn}/p/i/?c=subscription`).then(function () {
+        browser.get('https://' + app.fqdn);
-            return visible(by.xpath('//input[@name="url_rss"]'));
+
-        }).then(function () {
+        visible(by.id('stream'), function () {
-            return browser.findElement(by.xpath('//input[@name="url_rss"]')).sendKeys(url);
+            browser.findElement(by.xpath('//a[@href=".?c=subscription"]')).click();
-        }).then(function () {
+            visible(by.id('add_rss'), function () {
-            return browser.findElement(by.xpath('//form[@id="add_rss"]/div/button[@type="submit"]')).click();
+                browser.findElement(by.xpath('//input[@name="url_rss"]')).sendKeys(url);
-        }).then(function () {
+                browser.findElement(by.xpath('//form[@id="add_rss"]/div/button[@type="submit"]')).click();
-            return visible(by.xpath('//div[@id="notification" and @class="notification good"]'));
+                visible(by.xpath('//div[@id="notification" and @class="notification good"]'), function() { callback(); });
-        }).then(function () {
+            });
-            callback();
         });
     }
 
     function addUser(callback) {
         var test_username = 'test';
+        var manage_users_btn = by.xpath('//a[@href=".?c=user&a=manage"]');
 
-        browser.get(`https://${app.fqdn}/p/i/?c=user&a=manage`).then(function () {
+        browser.get('https://' + app.fqdn);
-            return visible(by.id('new_user_name'));
+
-        }).then(function () {
+        visible(by.id('stream'), function () {
-            return browser.findElement(by.id('new_user_name')).sendKeys(test_username);
+            browser.findElement(by.className('dropdown-toggle')).click();
-        }).then(function () {
+            visible(manage_users_btn, function () {
-            return browser.findElement(by.id('new_user_passwordPlain')).sendKeys(password);
+                browser.findElement(manage_users_btn).click();
-        }).then(function () {
+                visible(by.id('new_user_name'), function () {
-            return browser.findElement(by.xpath('//button[text()="Create"]')).click();
+                    browser.findElement(by.id('new_user_name')).sendKeys(test_username);
-        }).then(function () {
+                    browser.findElement(by.id('new_user_passwordPlain')).sendKeys(password);
-            return visible(by.xpath('//div[@id="notification" and @class="notification good"]'));
+                    browser.findElement(by.xpath('//form[@action=".?c=user&a=create"]/div/div/button[@type="submit"]')).click();
-        }).then(function () {
+                    visible(by.xpath('//div[@id="notification" and @class="notification good"]'), function() { callback(); });
-            callback();
+                });
+            });
         });
     }
 
@@ -129,17 +122,13 @@ describe('Application life cycle test', function () {
         browser.get('https://' + app.fqdn + '/p/i/?c=auth').then(function () {
             return browser.findElement(by.id('api_enabled')).click();
         }).then(function () {
-            return browser.findElement(by.xpath('//button[text()="Submit"]')).submit();
+            return browser.findElement(by.xpath('//form[@action=".?c=auth"]')).submit();
-        }).then(function () {
+        }).then(callback);
-            callback();
-        });
     }
 
     function checkApiConfiguration(callback) {
         browser.get('https://' + app.fqdn + '/p/api/greader.php/check%2Fcompatibility').then(function () {
-            return exists(by.xpath('//pre[text()="PASS"]'));
+            exists(by.xpath('//pre[text()="PASS"]'), callback);
-        }).then(function () {
-            callback();
         });
     }
 
@@ -150,22 +139,9 @@ describe('Application life cycle test', function () {
     }
 
     function subscriptionExists(callback) {
-        browser.get('https://' + app.fqdn + '/p/i/?get=c_1').then(function () {
+        browser.get('https://' + app.fqdn + '/p/i/?get=c_1');
-            return visible(by.xpath('//a[text()="Cloudron.io"]'));
-        }).then(function () {
-            callback();
-        });
-    }
 
-    function getStaticExtensionFile(callback) {
+        visible(by.xpath('//a[text()="Cloudron.io"]'), callback);
-        superagent.get(`https://${app.fqdn}/p/ext.php?f=xExtension-StickyFeeds/static/script.js&t=js`)
-            .buffer(true)
-            .end(function (err, res) {
-                expect(err).to.be(null);
-                expect(res.status).to.be(200);
-                expect(res.text).to.contain('sticky_feeds'); // relies on the buffer flag above
-                callback();
-        });
     }
 
     xit('build app', function () {
@@ -184,7 +160,6 @@ describe('Application life cycle test', function () {
     it('can enable API', enableApi);
     it('can check configuration', checkApiConfiguration);
     it('subscription exists', subscriptionExists);
-    it('can get static extension file', getStaticExtensionFile);
     it('can logout', logout);
 
     it('backup app', function () {
@@ -198,7 +173,6 @@ describe('Application life cycle test', function () {
     it('can login', login);
     it('can check configuration', checkApiConfiguration);
     it('subscription exists', subscriptionExists);
-    it('can get static extension file', getStaticExtensionFile);
     it('can logout', logout);
 
     it('move to different location', function () {
@@ -212,7 +186,6 @@ describe('Application life cycle test', function () {
     it('can login', login);
     it('can check configuration', checkApiConfiguration);
     it('subscription exists', subscriptionExists);
-    it('can get static extension file', getStaticExtensionFile);
     it('can logout', logout);
 
     it('uninstall app', function () {
@@ -238,7 +211,6 @@ describe('Application life cycle test', function () {
 
     it('can login', login);
     it('subscription exists', subscriptionExists);
-    it('can get static extension file', getStaticExtensionFile);
 
     it('uninstall app', function () {
         execSync('cloudron uninstall --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });