From 22d5d4c774181cff1664ec22409f4baa4fa05403 Mon Sep 17 00:00:00 2001
From: "ljf (zamentur)" <zamentur@users.noreply.github.com>
Date: Fri, 17 Aug 2018 18:31:48 +0200
Subject: [PATCH] [fix] Upgrade sources and fix postgresql version  (#6)

* [fix] Upgrade sources and fix postgresql version

* [fix] Update manifest
---
 conf/app.src                                  |  6 ++---
 manifest.json                                 |  4 ++--
 scripts/common.sh                             |  2 +-
 sources/patches/app-01-fix-requirements.patch | 23 -------------------
 4 files changed, 6 insertions(+), 29 deletions(-)
 delete mode 100644 sources/patches/app-01-fix-requirements.patch

diff --git a/conf/app.src b/conf/app.src
index 1c33fea..7b9885e 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://code.ffdn.org/FFDN/coin/archive/b746cf1059cc3308e2e9e197a5e023522bf184ea.tar.gz
-SOURCE_FILENAME=coin-2017-07-31.tar.gz
+SOURCE_URL=https://code.ffdn.org/FFDN/coin/archive/571df323feac6cb8fb338a8341bbd8c329f0d238.tar.gz
+SOURCE_FILENAME=coin-2018-08-17-2.tar.gz
 SOURCE_FORMAT=tar.gz
-SOURCE_SUM=de3807acef0069043be5376860e8bbabbb4cb4697778d37a031aa15ccfbae2dc
+SOURCE_SUM=09026019017592ea178e19a54443dbe928d191c13d7bb030c50e9e267988bf98
 SOURCE_SUM_PRG=sha256sum
diff --git a/manifest.json b/manifest.json
index 05d0325..c240411 100644
--- a/manifest.json
+++ b/manifest.json
@@ -14,9 +14,9 @@
     },
     "url": "https://code.ffdn.org/FFDN/coin/",
     "requirements": {
-        "yunohost": ">> 2.5.0"
+        "yunohost": ">> 3.0"
     },
-    "version": "20170802~ynh1",
+    "version": "20180817~ynh2",
     "multi_instance": false,
     "services": [
         "nginx"
diff --git a/scripts/common.sh b/scripts/common.sh
index 3f0e96b..3ecf90c 100644
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -8,7 +8,7 @@ function install_dependencies()
 function init_db()
 {
     sed -i '/local\s*all\s*all\s*peer/i \
-local all coin password' /etc/postgresql/9.4/main/pg_hba.conf
+local all coin password' /etc/postgresql/9.*/main/pg_hba.conf
     service postgresql reload
     # Generate random password
     db_name=$app
diff --git a/sources/patches/app-01-fix-requirements.patch b/sources/patches/app-01-fix-requirements.patch
deleted file mode 100644
index b04d28a..0000000
--- a/sources/patches/app-01-fix-requirements.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 5dbe24ccb81eaca81cbfc608e2aa70528dd3bc2c Mon Sep 17 00:00:00 2001
-From: ljf <ljf+yunohost@grimaud.me>
-Date: Tue, 27 Mar 2018 16:21:00 +0200
-Subject: [PATCH] [fix] requirements
-
----
- requirements.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/requirements.txt b/requirements.txt
-index 65b8bf8..e57bb95 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -1,5 +1,5 @@
- Django>=1.8.17,<1.9
--psycopg2==2.5.2
-+psycopg2>=2.5.4
- python-ldap==2.4.15
- wsgiref==0.1.2
- python-dateutil==2.2
--- 
-2.16.2
-