Add 4.2.5 changes

The demo setting didn't go well
Add 4.2.4 changes
2019-10-02 18:41:42 +02:00 · 2019-10-02 18:39:06 +02:00 · 2019-10-02 14:15:46 +02:00 · 2019-10-02 12:58:32 +02:00 · 2019-10-02 12:13:18 +02:00
3 changed files with 17 additions and 2 deletions
@@ -1684,3 +1684,9 @@
 * Add Skip backup option when updating an app
 * Fix bug where nginx was not reloaded on cert renewal

+[4.2.4]
+* Fix demo settings state regression
+
+[4.2.5]
+* Fix the demo settins fix
+
@@ -1,8 +1,7 @@
 'use strict';

 var async = require('async'),
-    fs = require('fs'),
-    superagent = require('superagent');
+    fs = require('fs');

 exports.up = function(db, callback) {
    if (!fs.existsSync('/etc/cloudron/cloudron.conf')) {
@@ -0,0 +1,10 @@
+'use strict';
+
+exports.up = function(db, callback) {
+    // We clear all demo state in the Cloudron...the demo cloudron needs manual intervention afterwards
+    db.runSql('REPLACE INTO settings (name, value) VALUES(?, ?)', [ 'demo', '' ], callback);
+};
+
+exports.down = function(db, callback) {
+    callback();
+};
Author	SHA1	Message	Date
Johannes Zellner	8b3e85907c	Add 4.2.5 changes	2019-10-02 18:41:42 +02:00
Johannes Zellner	ca4876649d	The demo setting didn't go well	2019-10-02 18:39:06 +02:00
Johannes Zellner	7ebc2abe5d	Add 4.2.4 changes	2019-10-02 14:15:46 +02:00
Johannes Zellner	37e132319b	Ensure demo setting is '' or 'enabled'	2019-10-02 12:58:32 +02:00
Johannes Zellner	b2728118e9	Remove unused require	2019-10-02 12:13:18 +02:00