Version 0.4.1

Add test for api configuration

See merge request !4

CHANGELOG

@@ -4,3 +4,17 @@
 [0.2.0]
 * Updated to base image 0.10.0
 * Supporting extensions
+
+[0.3.0]
+* No longer overwriting all config changes
+* Using cli scripts
+* Using scheduler for periodic task
+* Removed update menu item
+
+[0.4.0]
+* Updated to FreshRSS 1.6.3
+* Removed most custom patches (FreshRSS includes those now)
+
+[0.4.1]
+* Add parameter to allow for encoded slashes (thanks @Richard)
+* Updated description (thanks @Girish)

CloudronManifest.json

@@ -5,12 +5,18 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "RSS feed reader",
-  "version": "0.2.0",
+  "version": "0.4.1",
   "healthCheckPath": "/",
   "httpPort": 8000,
   "addons": {
     "localstorage": {},
-    "mysql": {}
+    "mysql": {},
+    "scheduler": {
+      "update_feeds": {
+        "schedule": "*/1 * * * *",
+        "command": "/usr/local/bin/gosu www-data:www-data php /app/code/app/actualize_script.php"
+      }
+    }
   },
   "manifestVersion": 1,
   "website": "http://www.freshrss.org",

DESCRIPTION.md

@@ -1,4 +1,4 @@
-This app packages FreshRSS 1.6.2.
+This app packages FreshRSS 1.6.3.
 
 FreshRSS is a self-hosted RSS feed aggregator such as Leed or Kriss Feed.
 

Dockerfile

@@ -7,7 +7,7 @@ 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.6.2
+ENV VERSION 1.6.3
 ENV EXTENSIONS_VERSION eac4b749775c3e1b584c1a6b4a4487e4a4b8b159
 
 RUN mkdir -p /app/code
@@ -24,7 +24,7 @@ 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 -p1 -d /app/code/extensions < /app/code/change-ttrss-file-path.patch \
+    && patch -p0 -d /app/code < /app/code/change-ttrss-file-path.patch \
     && 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
@@ -43,6 +43,5 @@ RUN rm -rf /var/lib/php \
     && ln -s /run/php /var/lib/php
 
 ADD start.sh /app/code/start.sh
-ADD setup_db.php /app/code/setup_db.php
 
 CMD [ "/app/code/start.sh" ]

apache2.conf

@@ -1,5 +1,6 @@
 <VirtualHost *:8000>
     DocumentRoot /app/code  
+    AllowEncodedSlashes On
 
     ErrorLog /dev/stderr 
     CustomLog /dev/stdout combined

setup_db.php

@@ -1,14 +0,0 @@
-<?PHP
-
-include_once('/app/code/app/SQL/install.sql.mysql.php');
-
-$c = new PDO("mysql:dbname=".getenv('MYSQL_DATABASE').";host=".getenv('MYSQL_HOST').";port=".getenv('MYSQL_PORT'), getenv('MYSQL_USERNAME'), getenv('MYSQL_PASSWORD'));
-
-$sql = sprintf(SQL_CREATE_TABLES, 'admin_', 'Uncategorized');
-$stm = $c->prepare($sql);
-$stm->execute();
-
-$sql = sprintf(SQL_INSERT_FEEDS, 'admin_');
-$stm = $c->prepare($sql);
-$stm->execute();
-

start.sh

@@ -7,20 +7,14 @@ mkdir -p /run/php/sessions
 if ! [ -f /app/data/.installed ]; then
   echo "Fresh installation, setting up..."
   rsync -a /app/code/data-orig/ /app/data/
-  dd if=/dev/urandom bs=1 count=1024 2>/dev/null | sha1sum | awk '{ print $1 }' > /app/data/.salt
-  mkdir -p /app/data/users/admin
-  cat > /app/data/users/admin/config.php <<EOF
-<?php
-return array (
-  'language' => 'en',
-  'passwordHash' => '\$2a\$09\$lO5xTAsfRCG1rSssJgHtTeiweXj2VwGN/JfuexIMpsQWzKoFVoklm',
-  'apiPasswordHash' => '',
-);
-?>
-EOF
-  touch /app/data/users/admin/log.txt
-  rm /app/data/do-install.txt
-  php /app/code/setup_db.php
+  php cli/do-install.php \
+    --environment production --default_user admin \
+    --db-type mysql --db-host "${MYSQL_HOST}:${MYSQL_PORT}" \
+    --db-user "${MYSQL_USERNAME}" --db-password "${MYSQL_PASSWORD}" \
+    --db-base "${MYSQL_DATABASE}" --db-prefix "" \
+    --disable_update
+  php cli/create-user.php --user admin --password password --language en
+  php cli/actualize-user.php --user admin
   touch /app/data/.installed
   echo "Done."
 fi
@@ -32,39 +26,18 @@ for f in $(ls /app/code/extensions-orig); do
   fi
 done
 
-echo "Creating config file"
-SALT=$(cat /app/data/.salt)
-cat > /app/data/config.php <<EOF
-<?php
- return array (
-  'salt' => '${SALT}',
-  'base_url' => 'https://${APP_DOMAIN}/p',
-  'title' => 'FreshRSS',
-  'default_user' => 'admin',
-  'auth_type' => 'form',
-  'db' => 
-  array (
-    'type' => 'mysql',
-    'host' => '${MYSQL_HOST}',
-    'user' => '${MYSQL_USERNAME}',
-    'password' => '${MYSQL_PASSWORD}',
-    'base' => '${MYSQL_DATABASE}',
-    'prefix' => '',
-    'pdo_options' => 
-    array (
-    ),
-  ),
-  'pubsubhubbub_enabled' => true,
-);
-EOF
 
+echo "Updating config file"
+php cli/reconfigure.php --default_user admin --base_url "https://${APP_DOMAIN}/p" \
+    --db-type mysql --db-host "${MYSQL_HOST}:${MYSQL_PORT}" \
+    --db-user "${MYSQL_USERNAME}" --db-password "${MYSQL_PASSWORD}" \
+    --db-base "${MYSQL_DATABASE}" --db-prefix "" \
+    --disable_update
+
+
+echo "Setting permissions"
 chown -R www-data.www-data /run/php /app/data
 
-echo "Trying to update feeds every 60 secs"
-while true; do
-  sleep 60
-  sudo -u www-data php /app/code/app/actualize_script.php >/dev/stdout 2>/dev/stderr
-done &
 
 echo "Starting apache"
 APACHE_CONFDIR="" source /etc/apache2/envvars

test/test.js

@@ -118,6 +118,19 @@ describe('Application life cycle test', function () {
         });
     }
 
+    function enableApi(callback) {
+        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('//form[@action=".?c=auth"]')).submit();
+        }).then(callback);
+    }
+
+    function checkApiConfiguration(callback) {
+        browser.get('https://' + app.fqdn + '/p/api/greader.php/check%2Fcompatibility').then(function () {
+            exists(by.xpath('//pre[text()="PASS"]'), callback);
+        });
+    }
 
     xit('build app', function () {
         execSync('cloudron build', { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
@@ -138,6 +151,8 @@ describe('Application life cycle test', function () {
     it('can login', login);
     it('can subscribe', addSubscription);
     it('can add users', addUser);
+    it('can enable API', enableApi);
+    it('can check configuration', checkApiConfiguration);
     it('can logout', logout);
 
     it('backup app', function () {
@@ -149,17 +164,19 @@ describe('Application life cycle test', function () {
     });
 
     it('can login', login);
+    it('can check configuration', checkApiConfiguration);
     it('can logout', logout);
 
     it('move to different location', function () {
         browser.manage().deleteAllCookies();
-        execSync('cloudron configure --location ' + LOCATION + '2', { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+        execSync('cloudron configure --wait --location ' + LOCATION + '2', { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
         var inspect = JSON.parse(execSync('cloudron inspect'));
         app = inspect.apps.filter(function (a) { return a.location === LOCATION + '2'; })[0];
         expect(app).to.be.an('object');
     });
 
     it('can login', login);
+    it('can check configuration', checkApiConfiguration);
     it('can logout', logout);
 
     it('uninstall app', function () {