Bump version and update to 0.10.2

CHANGELOG

@@ -35,9 +35,4 @@
 * Update to FreshRSS 1.9.0
 
 [0.9.0]
-* Update to FreshRSS 1.10.2
-
-[0.10.0]
-* Better apache configs
-* Update extensions
-
+* Update to FreshRSS 1.10.2

CloudronManifest.json

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

Dockerfile

@@ -5,7 +5,7 @@ RUN apt-get update \
        libapache2-mod-php mysql-client php-mysql
 
 ENV VERSION 1.10.2
-ENV EXTENSIONS_VERSION b63f55d6fdd8e93da846bb741c3fed12d50909be
+ENV EXTENSIONS_VERSION a60a0ce5d0d864b5654a4d2609167d03c2299500
 
 RUN mkdir -p /app/code
 WORKDIR /app/code
@@ -13,10 +13,12 @@ WORKDIR /app/code
 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/${EXTENSIONS_VERSION}.tar.gz -O - \
     | tar -xz --strip-components=1 -C /app/code/extensions \
     && patch -p0 -d /app/code < /app/code/change-ttrss-file-path.patch \
@@ -24,16 +26,15 @@ RUN wget https://github.com/FreshRSS/Extensions/archive/${EXTENSIONS_VERSION}.ta
     && ln -s /app/data/extensions /app/code/extensions \
     && ln -s /app/data/extensions/ttrss.php /app/code/p/api/ttrss.php
 
-# configure apache
-RUN rm /etc/apache2/sites-enabled/*
-RUN sed -e 's,^ErrorLog.*,ErrorLog "|/bin/cat",' -i /etc/apache2/apache2.conf
-COPY apache/mpm_prefork.conf /etc/apache2/mods-available/mpm_prefork.conf
+ADD apache2.conf /etc/apache2/sites-available/freshrss.conf
 
-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
+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>
-

test/package-lock.json

@@ -100,9 +100,9 @@
       "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
     },
     "chromedriver": {
-      "version": "2.38.3",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-2.38.3.tgz",
-      "integrity": "sha512-tczy6RHl0LOVA4p+xezcu3NRjr9A1iLyyfjP9yPIUynvV28YSKH/Ll1iw0jMCjN9jwtaB2HB4aPjv0Uuw2VARw==",
+      "version": "2.36.0",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-2.36.0.tgz",
+      "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.4.0"
+    "superagent": "^1.4.0",
+    "chromedriver": "^2.27.0"
   }
 }

test/test.js

@@ -2,8 +2,6 @@
 
 'use strict';
 
-require('chromedriver');
-
 var execSync = require('child_process').execSync,
     expect = require('expect.js'),
     path = require('path'),