From 944cb7c873e156304a6526981146a98c17d8e40d Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Sat, 19 Oct 2019 01:57:09 +0200
Subject: [PATCH] upgrade to develop

---
 conf/arm.src    | 4 ++--
 conf/arm64.src  | 4 ++--
 conf/x86-64.src | 4 ++--
 scripts/install | 3 +--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/conf/arm.src b/conf/arm.src
index 1ef05b2..62b5173 100644
--- a/conf/arm.src
+++ b/conf/arm.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/69896/artifacts/download
-SOURCE_SUM=4350d3e22525c1d3a31180bbcfee69c38832b883e121eae5781f3b863c11725b
+SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/70233/artifacts/download
+SOURCE_SUM=4fc234c0c214056d7e7c60a8583eaa9cbc366fd0d5465b6fb6431705b481ece8
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true
diff --git a/conf/arm64.src b/conf/arm64.src
index 06324e5..8893893 100644
--- a/conf/arm64.src
+++ b/conf/arm64.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/69898/artifacts/download
-SOURCE_SUM=705ef794a52e4d341c0395d5747d41203a80731f785572c9cca3bd7ac3dffcb0
+SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/70235/artifacts/download
+SOURCE_SUM=b746915ac44293168d924817027b1dbcec75de2a8205d327c4c4c10c5e563065
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true
diff --git a/conf/x86-64.src b/conf/x86-64.src
index 4daece1..d92313a 100644
--- a/conf/x86-64.src
+++ b/conf/x86-64.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/69894/artifacts/download
-SOURCE_SUM=e4e46ddd6b627afe4ebf38625c24ea25f8f29afeffd85efcca1f48a38ec60241
+SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/70231/artifacts/download
+SOURCE_SUM=091973bdaf99c11fd1a30984a3c9c906e5a3c3183f685f589d12290fdaa37a53
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true
diff --git a/scripts/install b/scripts/install
index 5f266ac..3d11420 100755
--- a/scripts/install
+++ b/scripts/install
@@ -222,8 +222,6 @@ ynh_add_systemd_config
 chown -R "$app":"$app" "$final_path"
 
 pushd $final_path/$app
-    #ynh_replace_string --match_string="static_dir" --replace_string="static" --target_file="$final_path/$app/releases/1.1.1/releases.exs"
-    ynh_replace_string --match_string="shift" --replace_string="" --target_file="$final_path/$app/releases/1.1.1/releases.exs"
     su "$app" -s $SHELL -lc "$final_path/$app/bin/pleroma_ctl instance gen --force \
     --output $config \
     --output-psql /tmp/setup_db.psql \
@@ -236,6 +234,7 @@ pushd $final_path/$app
     --dbuser $db_user \
     --dbpass $db_pwd \
     --rum N \
+    --db-configurable Y \
     --indexable Y \
     --uploads-dir $datadir/uploads \
     --static-dir $datadir/static \