From 0963bf3d83005c5f9dc7527fc2b21a400816f433 Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Sat, 4 Mar 2017 14:53:13 +0100
Subject: [PATCH 1/3] Update to upstream version 1.0.40

---
 README.markdown    | 16 ++++++----------
 conf/config.php    | 10 ++++++++--
 scripts/_common.sh |  2 +-
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/README.markdown b/README.markdown
index 0d1d9b4..22c3fc4 100644
--- a/README.markdown
+++ b/README.markdown
@@ -33,7 +33,7 @@ From command line:
 
 Infos
 -----
-Kanboard v1.0.36
+Kanboard v1.0.40
 
 Yunohost forum thread:  <https://forum.yunohost.org/t/kanboard-package/78>
 
@@ -42,25 +42,21 @@ Kanboard and SSOwat
 Kanboard use SSOwat for user authentification (it means it use the user that the web server (nginx) sent him throught SSOwat), but can't list all user of the system.
 If you wish to add a user, just log in with that user into Kanboard so the software knows him and displays it.
 
-Developper infos
+Developer infos
 ----------------
 
 Please do your pull request to the dev branch.
 
-Update package:
-```
-wget http://kanboard.net/kanboard-latest.zip
-unzip kanboard-latest.zip
-rm -Rf sources
-mv kanboard sources
-```
-Then do a manual diff between `conf/config.php` and `sources/config.default.php` to see if there are new config options
+Update package version in `scripts/_common.sh`
+
+Then do a manual diff between `conf/config.php` and `config.default.php` [from upstream Kanboard project](https://github.com/kanboard/kanboard/blob/master/config.default.php) to see if there are new config options
 
 Update readme with the new version
 
 Test it
 
 Test or upgrade to dev version:
+
 ```
 su - admin
 git clone -b dev https://github.com/YunoHost-Apps/kanboard_ynh
diff --git a/conf/config.php b/conf/config.php
index d0a427f..ffefc16 100644
--- a/conf/config.php
+++ b/conf/config.php
@@ -1,7 +1,7 @@
 <?php
 
-// Data folder (must be writeable by the web server user)
-define('DATA_DIR', 'data');
+// Data folder (must be writeable by the web server user and absolute)
+define('DATA_DIR', __DIR__.DIRECTORY_SEPARATOR.'data');
 
 // Enable/Disable debug
 define('DEBUG', false);
@@ -30,6 +30,9 @@ define('CACHE_DIR', DATA_DIR.DIRECTORY_SEPARATOR.'cache');
 // Folder for uploaded files (must be writeable by the web server user)
 define('FILES_DIR', DATA_DIR.DIRECTORY_SEPARATOR.'files');
 
+// Enable/disable email configuration from the user interface
+define('MAIL_CONFIGURATION', true);
+
 // E-mail address for the "From" header (notifications)
 define('MAIL_FROM', 'yuno_email');
 
@@ -225,5 +228,8 @@ define('HTTP_PROXY_PORT', '3128');
 define('HTTP_PROXY_USERNAME', '');
 define('HTTP_PROXY_PASSWORD', '');
 
+// Set to false to allow self-signed certificates
+define('HTTP_VERIFY_SSL_CERTIFICATE', false);
+
 // TOTP (2FA) issuer name
 define('TOTP_ISSUER', 'Kanboard');
\ No newline at end of file
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 3d032e7..3b0b981 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -3,7 +3,7 @@
 #
 
 # Application version
-VERSION="1.0.36"
+VERSION="1.0.40"
 
 # Remote URL to fetch application source archive
 APPLICATION_SOURCE_URL="https://kanboard.net/kanboard-${VERSION}.zip"

From f7295602544ff850721eefb1d50f1a2d177ea0ea Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Thu, 23 Mar 2017 21:59:18 +0100
Subject: [PATCH 2/3] Upgrade to upstream version 1.0.41 (closes #43)

---
 README.markdown    | 2 +-
 manifest.json      | 1 +
 scripts/_common.sh | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.markdown b/README.markdown
index 22c3fc4..a97b6c1 100644
--- a/README.markdown
+++ b/README.markdown
@@ -33,7 +33,7 @@ From command line:
 
 Infos
 -----
-Kanboard v1.0.40
+Kanboard v1.0.41
 
 Yunohost forum thread:  <https://forum.yunohost.org/t/kanboard-package/78>
 
diff --git a/manifest.json b/manifest.json
index e1873f8..d38414a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,6 +6,7 @@
         "en": "Kanboard is a simple visual task board web application",
         "fr": "Kanboard est une application web de management de tâches simples"
     },
+    "version": "1.0.41",
     "url": "http://kanboard.net/",
     "maintainer": {
         "name": "mbugeia",
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 3b0b981..8d9086b 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -3,7 +3,7 @@
 #
 
 # Application version
-VERSION="1.0.40"
+VERSION="1.0.41"
 
 # Remote URL to fetch application source archive
 APPLICATION_SOURCE_URL="https://kanboard.net/kanboard-${VERSION}.zip"

From d1a3a7af0a361b4ff7a505376f2186d955663b3f Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Thu, 23 Mar 2017 22:33:27 +0100
Subject: [PATCH 3/3] Run migrations during upgrade script (closes #42)

---
 conf/config.php | 2 +-
 scripts/upgrade | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/conf/config.php b/conf/config.php
index ffefc16..211db4c 100644
--- a/conf/config.php
+++ b/conf/config.php
@@ -52,7 +52,7 @@ define('MAIL_SENDMAIL_COMMAND', '/usr/sbin/sendmail -bs');
 // Run automatically database migrations
 // If set to false, you will have to run manually the SQL migrations from the CLI during the next Kanboard upgrade
 // Do not run the migrations from multiple processes at the same time (example: web page + background worker)
-define('DB_RUN_MIGRATIONS', true);
+define('DB_RUN_MIGRATIONS', false);
 
 // Database driver: sqlite, mysql or postgres (sqlite by default)
 define('DB_DRIVER', 'mysql');
diff --git a/scripts/upgrade b/scripts/upgrade
index b5fa187..794b44f 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -64,6 +64,9 @@ sudo sed -i "s/yuno_domain/${domain}/g" ${DESTDIR}/config.php
 sudo chown -R root:root ${DESTDIR}
 sudo chown -R www-data:www-data ${DESTDIR}/data
 
+# Launch database migration
+sudo ${DESTDIR}/cli db:migrate
+
 # Copy and set php-fpm configuration
 phpfpm_conf="/etc/php5/fpm/pool.d/${app}.conf"
 sed -i "s@#USER#@${app}@g"         ../conf/php-fpm.conf