From 1ba6dd814d4cd9a26b1075f8e050b3478b503700 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Sun, 24 Feb 2019 12:46:07 +0100
Subject: [PATCH 01/12] Remove repository references

---
 scripts/install | 33 ++++++++++++++++++++++++---------
 scripts/remove  |  8 +++++++-
 scripts/upgrade |  3 +++
 3 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/scripts/install b/scripts/install
index 24cf001..3c2226a 100755
--- a/scripts/install
+++ b/scripts/install
@@ -106,6 +106,21 @@ port=$(ynh_find_port 8095)
 #ynh_exec_warn_less yunohost firewall allow --no-upnp TCP $port
 ynh_app_setting_set $app port $port
 
+#=================================================
+# INSTALL ERLANG 1.21.2.6-1
+#=================================================
+ynh_print_info "Installing erlang 1.21.2.6-1..."
+
+if [ "$(lsb_release --codename --short)" == "jessie" ]; then
+	#sudo apt install -y ../sources/esl-erlang_21.2.6-1~debian~jessie_amd64.deb
+	#sudo apt install -y ../sources/elixir_1.8.1-2~debian~jessie_amd64.deb
+elif 
+	[ "$(lsb_release --codename --short)" == "stretch" ]; then
+	#sudo apt install -y ../sources/esl-erlang_21.2.6-1~debian~stretch_amd64.deb
+	#sudo apt install -y ../sources/elixir_1.8.1-2~debian~stretch_amd64.deb
+fi
+
+
 #=================================================
 # INSTALL DEPENDENCIES
 #=================================================
@@ -120,15 +135,15 @@ ynh_print_info "Installing dependencies ..."
 
 # Add erlang for Debian Jessie 
 
-if [ "$(lsb_release --codename --short)" == "jessie" ]; then
-	echo "deb http://packages.erlang-solutions.com/debian jessie contrib" | tee /etc/apt/sources.list.d/erlang-solutions.list
-elif 
-	[ "$(lsb_release --codename --short)" == "stretch" ]; then
-	echo "deb http://packages.erlang-solutions.com/debian stretch contrib" | tee /etc/apt/sources.list.d/erlang-solutions.list
-fi
-sudo wget https://packages.erlang-solutions.com/debian/erlang_solutions.asc
-sudo apt-key add erlang_solutions.asc
-sudo rm erlang_solutions.asc
+#if [ "$(lsb_release --codename --short)" == "jessie" ]; then
+#	echo "deb http://packages.erlang-solutions.com/debian jessie contrib" | tee /etc/apt/sources.list.d/erlang-solutions.list
+#elif 
+#	[ "$(lsb_release --codename --short)" == "stretch" ]; then
+#	echo "deb http://packages.erlang-solutions.com/debian stretch contrib" | tee /etc/apt/sources.list.d/erlang-solutions.list
+#fi
+#sudo wget https://packages.erlang-solutions.com/debian/erlang_solutions.asc
+#sudo apt-key add erlang_solutions.asc
+#sudo rm erlang_solutions.asc
 
 # install dependencies
 ynh_install_app_dependencies git build-essential openssl ssh sudo postgresql postgresql-contrib elixir erlang-dev erlang-parsetools erlang-xmerl erlang-tools
diff --git a/scripts/remove b/scripts/remove
index 6b280b1..ddbee98 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -68,7 +68,13 @@ ynh_print_info "Removing dependencies"
 
 # Remove metapackage and its dependencies
 ynh_remove_app_dependencies
-ynh_secure_remove "/etc/apt/sources.list.d/erlang-solutions.list"
+
+#=================================================
+# REMOVE ERLANG 1.21.2.6-1
+#=================================================
+ynh_print_info "Removing erlang 1.21.2.6-1..."
+
+#sudo apt remove -y esl-erlang
 
 #=================================================
 # REMOVE APP MAIN DIR
diff --git a/scripts/upgrade b/scripts/upgrade
index a625d2d..8b74dde 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -70,6 +70,9 @@ if [ -z $final_path ]; then
 	ynh_app_setting_set $app final_path $final_path
 fi
 
+# Remove repository
+ynh_secure_remove "/etc/apt/sources.list.d/erlang-solutions.list"
+
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
 #=================================================

From 56557037d26fed9d80108d8c69d76d5cb77a7b52 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Sun, 24 Feb 2019 12:48:17 +0100
Subject: [PATCH 02/12] Fix install

---
 scripts/install | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/install b/scripts/install
index 3c2226a..2378631 100755
--- a/scripts/install
+++ b/scripts/install
@@ -111,14 +111,14 @@ ynh_app_setting_set $app port $port
 #=================================================
 ynh_print_info "Installing erlang 1.21.2.6-1..."
 
-if [ "$(lsb_release --codename --short)" == "jessie" ]; then
+#if [ "$(lsb_release --codename --short)" == "jessie" ]; then
 	#sudo apt install -y ../sources/esl-erlang_21.2.6-1~debian~jessie_amd64.deb
 	#sudo apt install -y ../sources/elixir_1.8.1-2~debian~jessie_amd64.deb
-elif 
-	[ "$(lsb_release --codename --short)" == "stretch" ]; then
+#elif 
+#	[ "$(lsb_release --codename --short)" == "stretch" ]; then
 	#sudo apt install -y ../sources/esl-erlang_21.2.6-1~debian~stretch_amd64.deb
 	#sudo apt install -y ../sources/elixir_1.8.1-2~debian~stretch_amd64.deb
-fi
+#fi
 
 
 #=================================================

From ba6fea7fc5c0d6fe5ae303bb42caa0bc776dfe40 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Sun, 24 Feb 2019 12:55:22 +0100
Subject: [PATCH 03/12] Adding elixir and erlang

---
 scripts/install | 17 ++++++++---------
 scripts/remove  |  3 ++-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/scripts/install b/scripts/install
index 2378631..22baeaa 100755
--- a/scripts/install
+++ b/scripts/install
@@ -111,15 +111,14 @@ ynh_app_setting_set $app port $port
 #=================================================
 ynh_print_info "Installing erlang 1.21.2.6-1..."
 
-#if [ "$(lsb_release --codename --short)" == "jessie" ]; then
-	#sudo apt install -y ../sources/esl-erlang_21.2.6-1~debian~jessie_amd64.deb
-	#sudo apt install -y ../sources/elixir_1.8.1-2~debian~jessie_amd64.deb
-#elif 
-#	[ "$(lsb_release --codename --short)" == "stretch" ]; then
-	#sudo apt install -y ../sources/esl-erlang_21.2.6-1~debian~stretch_amd64.deb
-	#sudo apt install -y ../sources/elixir_1.8.1-2~debian~stretch_amd64.deb
-#fi
-
+if [ "$(lsb_release --codename --short)" == "jessie" ]; then
+	sudo apt install -y ../sources/esl-erlang_21.2.6-1~debian~jessie_amd64.deb
+	sudo apt install -y ../sources/elixir_1.8.1-2~debian~jessie_amd64.deb
+elif 
+	[ "$(lsb_release --codename --short)" == "stretch" ]; then
+	sudo apt install -y ../sources/esl-erlang_21.2.6-1~debian~stretch_amd64.deb
+	sudo apt install -y ../sources/elixir_1.8.1-2~debian~stretch_amd64.deb
+fi
 
 #=================================================
 # INSTALL DEPENDENCIES
diff --git a/scripts/remove b/scripts/remove
index ddbee98..a09fa5d 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -74,7 +74,8 @@ ynh_remove_app_dependencies
 #=================================================
 ynh_print_info "Removing erlang 1.21.2.6-1..."
 
-#sudo apt remove -y esl-erlang
+sudo apt remove -y esl-erlang
+sudo apt remove -y elixir
 
 #=================================================
 # REMOVE APP MAIN DIR

From 801c0ff00a190b29faa55e63905cd28ed83bfc07 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Sun, 24 Feb 2019 13:08:54 +0100
Subject: [PATCH 04/12] remove erlang installation from sources

---
 scripts/install | 6 ++----
 scripts/remove  | 5 ++---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/scripts/install b/scripts/install
index 22baeaa..0a06b7b 100755
--- a/scripts/install
+++ b/scripts/install
@@ -107,16 +107,14 @@ port=$(ynh_find_port 8095)
 ynh_app_setting_set $app port $port
 
 #=================================================
-# INSTALL ERLANG 1.21.2.6-1
+# INSTALL ELIXIR 1.8.1-2
 #=================================================
-ynh_print_info "Installing erlang 1.21.2.6-1..."
+ynh_print_info "Installing elixir 1.8.1-2..."
 
 if [ "$(lsb_release --codename --short)" == "jessie" ]; then
-	sudo apt install -y ../sources/esl-erlang_21.2.6-1~debian~jessie_amd64.deb
 	sudo apt install -y ../sources/elixir_1.8.1-2~debian~jessie_amd64.deb
 elif 
 	[ "$(lsb_release --codename --short)" == "stretch" ]; then
-	sudo apt install -y ../sources/esl-erlang_21.2.6-1~debian~stretch_amd64.deb
 	sudo apt install -y ../sources/elixir_1.8.1-2~debian~stretch_amd64.deb
 fi
 
diff --git a/scripts/remove b/scripts/remove
index a09fa5d..4b6b1be 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -70,11 +70,10 @@ ynh_print_info "Removing dependencies"
 ynh_remove_app_dependencies
 
 #=================================================
-# REMOVE ERLANG 1.21.2.6-1
+# REMOVE ELIXIR 1.8.1-2
 #=================================================
-ynh_print_info "Removing erlang 1.21.2.6-1..."
+ynh_print_info "Removing elixir 1.8.1-2..."
 
-sudo apt remove -y esl-erlang
 sudo apt remove -y elixir
 
 #=================================================

From 1506019a3e11d7c82bcb2ae76dc0cbf0155ab87b Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Sun, 24 Feb 2019 13:13:07 +0100
Subject: [PATCH 05/12] Add erlang

---
 scripts/install | 6 ++++--
 scripts/remove  | 5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/scripts/install b/scripts/install
index 0a06b7b..6c214d7 100755
--- a/scripts/install
+++ b/scripts/install
@@ -107,14 +107,16 @@ port=$(ynh_find_port 8095)
 ynh_app_setting_set $app port $port
 
 #=================================================
-# INSTALL ELIXIR 1.8.1-2
+# INSTALL ERLANG and ELIXIR
 #=================================================
-ynh_print_info "Installing elixir 1.8.1-2..."
+ynh_print_info "Installing erlang and elixir ..."
 
 if [ "$(lsb_release --codename --short)" == "jessie" ]; then
+	sudo apt install -y ../sources/esl-erlang_21.2.6-1~debian~jessie_amd64.deb
 	sudo apt install -y ../sources/elixir_1.8.1-2~debian~jessie_amd64.deb
 elif 
 	[ "$(lsb_release --codename --short)" == "stretch" ]; then
+	sudo apt install -y ../sources/esl-erlang_21.2.6-1~debian~stretch_amd64.deb
 	sudo apt install -y ../sources/elixir_1.8.1-2~debian~stretch_amd64.deb
 fi
 
diff --git a/scripts/remove b/scripts/remove
index 4b6b1be..c4f0ffb 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -70,10 +70,11 @@ ynh_print_info "Removing dependencies"
 ynh_remove_app_dependencies
 
 #=================================================
-# REMOVE ELIXIR 1.8.1-2
+# REMOVE ERLANG AND ELIXIR
 #=================================================
-ynh_print_info "Removing elixir 1.8.1-2..."
+ynh_print_info "Removing erlang and elixir..."
 
+sudo apt remove -y esl-erlang
 sudo apt remove -y elixir
 
 #=================================================

From c8abaacd6b16cf7512a84c3210a6959f7aa033ed Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Sun, 24 Feb 2019 14:57:04 +0100
Subject: [PATCH 06/12] Cleaning install script

---
 scripts/install | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/scripts/install b/scripts/install
index 6c214d7..6ea7a71 100755
--- a/scripts/install
+++ b/scripts/install
@@ -132,19 +132,6 @@ ynh_print_info "Installing dependencies ..."
 ###		- As well as the section "REINSTALL DEPENDENCIES" in the restore script
 ###		- And the section "UPGRADE DEPENDENCIES" in the upgrade script
 
-# Add erlang for Debian Jessie 
-
-#if [ "$(lsb_release --codename --short)" == "jessie" ]; then
-#	echo "deb http://packages.erlang-solutions.com/debian jessie contrib" | tee /etc/apt/sources.list.d/erlang-solutions.list
-#elif 
-#	[ "$(lsb_release --codename --short)" == "stretch" ]; then
-#	echo "deb http://packages.erlang-solutions.com/debian stretch contrib" | tee /etc/apt/sources.list.d/erlang-solutions.list
-#fi
-#sudo wget https://packages.erlang-solutions.com/debian/erlang_solutions.asc
-#sudo apt-key add erlang_solutions.asc
-#sudo rm erlang_solutions.asc
-
-# install dependencies
 ynh_install_app_dependencies git build-essential openssl ssh sudo postgresql postgresql-contrib elixir erlang-dev erlang-parsetools erlang-xmerl erlang-tools
 
 #=================================================

From 05915f39efc4d49e47b3c77e9e1565fd612d61ad Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Sun, 24 Feb 2019 15:15:43 +0100
Subject: [PATCH 07/12] Upgrade to 0.9.9

---
 README.md       | 2 +-
 conf/app.src    | 4 ++--
 manifest.json   | 2 +-
 scripts/install | 3 +--
 scripts/upgrade | 6 +-----
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index ef7188c..3cd42fb 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ For user friendly details about Pleroma: [see here](https://blog.soykaf.com/post
 - Tootdon (Android + iOS)
 - Tootle (iOS)
 
-**Shipped version:** 0.9.0
+**Shipped version:** 0.9.9
 
 ## Important points to read before installing
 
diff --git a/conf/app.src b/conf/app.src
index e4dd89f..6e673f7 100755
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=url of app's source
-SOURCE_SUM=sha256 checksum
+SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/archive/v0.9.9/pleroma-v0.9.9.tar.gz
+SOURCE_SUM=21a25c34cfd9399e6b2feed570ea67f1f61a14304fadabb0283a03724b076a5f
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index 482e2e9..c29709e 100755
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Pleroma is an OStatus-compatible social networking server written in Elixir, compatible with GNU Social and Mastodon",
         "fr": "Pleroma est un réseau social écrit en Elixir, compatible avec OStatus, GNU Social et Mastodon"
     },
-    "version": "0.9.0~ynh4",
+    "version": "0.9.9~ynh1",
     "url": "https://git.pleroma.social/pleroma/pleroma",
     "license": "AGPL-3.0-only",
     "maintainer": {
diff --git a/scripts/install b/scripts/install
index 6ea7a71..aba974d 100755
--- a/scripts/install
+++ b/scripts/install
@@ -172,8 +172,7 @@ ynh_print_info "Setting up source files ..."
 
 ynh_app_setting_set $app final_path $final_path
 # Download, check integrity, uncompress and patch the source from app.src
-#ynh_setup_source "$final_path/$app"
-git clone https://git.pleroma.social/pleroma/pleroma "$final_path/$app"
+ynh_setup_source "$final_path/$app"
 
 #=================================================
 # NGINX CONFIGURATION
diff --git a/scripts/upgrade b/scripts/upgrade
index 8b74dde..fe8df2b 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -109,11 +109,7 @@ path_url=$(ynh_normalize_url_path $path_url)
 ynh_print_info "Upgrading source files..."
 
 # Download, check integrity, uncompress and patch the source from app.src
-#ynh_setup_source "$final_path/$app"
-pushd $final_path/$app
-    git reset --hard
-    git pull --quiet
-popd
+ynh_setup_source "$final_path/$app"
 
 #=================================================
 # NGINX CONFIGURATION

From 69f73daf7b13009792b604ccd216590aba69a464 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Sun, 24 Feb 2019 15:45:53 +0100
Subject: [PATCH 08/12] Upgrade to 0.9.9 final

---
 conf/systemd.service | 20 ++++++++++++++------
 scripts/install      |  6 ++++--
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/conf/systemd.service b/conf/systemd.service
index d4bd6f0..104157b 100755
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -3,15 +3,23 @@ Description=__APP__  social network
 After=network.target postgresql.service
 
 [Service]
-Environment="MIX_ENV=prod"
-User=__APP__
-Group=__APP__
-WorkingDirectory=__FINALPATH__/__APP__
-Environment="HOME=__FINALPATH__"
-ExecStart=/usr/bin/mix phx.server
 ExecReload=/bin/kill $MAINPID
 KillMode=process
 Restart=on-failure
+
+; Name of the user that runs the Pleroma service.
+User=__APP__
+Group=__APP__
+; Declares that Pleroma runs in production mode.
+Environment="MIX_ENV=prod"
+
+; Make sure that all paths fit your installation.
+; Path to the home directory of the user running the Pleroma service.
+Environment="HOME=__FINALPATH__"
+; Path to the folder containing the Pleroma installation.
+WorkingDirectory=__FINALPATH__/__APP__
+; Path to the Mix binary.
+ExecStart=/usr/bin/mix phx.server
 StandardOutput=syslog
 StandardError=syslog
 
diff --git a/scripts/install b/scripts/install
index aba974d..0fa213d 100755
--- a/scripts/install
+++ b/scripts/install
@@ -155,9 +155,11 @@ ynh_psql_create_user "$app" "$db_pwd"
 ynh_psql_execute_as_root \
 "CREATE DATABASE $db_name ENCODING 'UTF8' LC_COLLATE='C' LC_CTYPE='C' template=template0 OWNER $db_name;"
 ynh_psql_execute_as_root "\connect $db_name 
-CREATE EXTENSION IF NOT EXISTS unaccent;CREATE EXTENSION IF NOT EXISTS pg_trgm;"
+CREATE EXTENSION IF NOT EXISTS unaccent;"
 ynh_psql_execute_as_root "\connect $db_name 
-CREATE EXTENSION IF NOT EXISTS unaccent;CREATE EXTENSION IF NOT EXISTS citext;"
+CREATE EXTENSION IF NOT EXISTS pg_trgm;"
+ynh_psql_execute_as_root "\connect $db_name 
+CREATE EXTENSION IF NOT EXISTS citext;"
 ynh_psql_execute_as_root "\connect $db_name 
 CREATE EXTENSION IF NOT EXISTS \"uuid-ossp\";"
 

From d109508c4cdc543ff803675c7a5ce8755fab5f38 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Sun, 24 Feb 2019 15:48:11 +0100
Subject: [PATCH 09/12] remove repo dependency

---
 scripts/upgrade | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index fe8df2b..9bc7acd 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -132,23 +132,25 @@ then
 	ynh_store_file_checksum "/etc/nginx/conf.d/$domain.d/$app.conf"
 fi
 
+#=================================================
+# INSTALL ERLANG and ELIXIR
+#=================================================
+ynh_print_info "Installing erlang and elixir ..."
+
+if [ "$(lsb_release --codename --short)" == "jessie" ]; then
+	sudo apt install -y ../sources/esl-erlang_21.2.6-1~debian~jessie_amd64.deb
+	sudo apt install -y ../sources/elixir_1.8.1-2~debian~jessie_amd64.deb
+elif 
+	[ "$(lsb_release --codename --short)" == "stretch" ]; then
+	sudo apt install -y ../sources/esl-erlang_21.2.6-1~debian~stretch_amd64.deb
+	sudo apt install -y ../sources/elixir_1.8.1-2~debian~stretch_amd64.deb
+fi
+
 #=================================================
 # UPGRADE DEPENDENCIES
 #=================================================
 ynh_print_info "Upgrading dependencies..."
 
-# Add erlang for Debian Jessie 
-
-if [ "$(lsb_release --codename --short)" == "jessie" ]; then
-	echo "deb http://packages.erlang-solutions.com/debian jessie contrib" | tee /etc/apt/sources.list.d/erlang-solutions.list
-elif 
-	[ "$(lsb_release --codename --short)" == "stretch" ]; then
-	echo "deb http://packages.erlang-solutions.com/debian stretch contrib" | tee /etc/apt/sources.list.d/erlang-solutions.list
-fi
-sudo wget https://packages.erlang-solutions.com/debian/erlang_solutions.asc
-sudo apt-key add erlang_solutions.asc
-sudo rm erlang_solutions.asc
-
 # install dependencies
 ynh_install_app_dependencies git build-essential openssl ssh sudo postgresql postgresql-contrib elixir erlang-dev erlang-parsetools erlang-xmerl erlang-tools
 

From 8cb35d698d0847fe2b0166924f388d5f68b9223c Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Sun, 24 Feb 2019 16:47:21 +0100
Subject: [PATCH 10/12] Fix restore

---
 scripts/restore | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/scripts/restore b/scripts/restore
index f8412bc..ca391e1 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -89,23 +89,25 @@ chown -R "$app":"$app" "$final_path"
 
 #=================================================
 # SPECIFIC RESTORATION
+#=================================================
+# INSTALL ERLANG and ELIXIR
+#=================================================
+ynh_print_info "Installing erlang and elixir ..."
+
+if [ "$(lsb_release --codename --short)" == "jessie" ]; then
+	sudo apt install -y ../sources/esl-erlang_21.2.6-1~debian~jessie_amd64.deb
+	sudo apt install -y ../sources/elixir_1.8.1-2~debian~jessie_amd64.deb
+elif 
+	[ "$(lsb_release --codename --short)" == "stretch" ]; then
+	sudo apt install -y ../sources/esl-erlang_21.2.6-1~debian~stretch_amd64.deb
+	sudo apt install -y ../sources/elixir_1.8.1-2~debian~stretch_amd64.deb
+fi
+
 #=================================================
 # REINSTALL DEPENDENCIES
 #=================================================
 ynh_print_info "Reinstalling dependencies..."
 
-# Add erlang for Debian Jessie 
-
-if [ "$(lsb_release --codename --short)" == "jessie" ]; then
-	echo "deb http://packages.erlang-solutions.com/debian jessie contrib" | tee /etc/apt/sources.list.d/erlang-solutions.list
-elif 
-	[ "$(lsb_release --codename --short)" == "stretch" ]; then
-	echo "deb http://packages.erlang-solutions.com/debian stretch contrib" | tee /etc/apt/sources.list.d/erlang-solutions.list
-fi
-sudo wget https://packages.erlang-solutions.com/debian/erlang_solutions.asc
-sudo apt-key add erlang_solutions.asc
-sudo rm erlang_solutions.asc
-
 # Define and install dependencies
 ynh_install_app_dependencies git build-essential openssl ssh sudo postgresql postgresql-contrib elixir erlang-dev erlang-parsetools erlang-xmerl erlang-tools
 
@@ -119,9 +121,11 @@ ynh_psql_create_user "$app" "$db_pwd"
 ynh_psql_execute_as_root \
 "CREATE DATABASE $db_name ENCODING 'UTF8' LC_COLLATE='C' LC_CTYPE='C' template=template0 OWNER $app;"
 ynh_psql_execute_as_root "\connect $db_name 
-CREATE EXTENSION IF NOT EXISTS unaccent;CREATE EXTENSION IF NOT EXISTS pg_trgm;"
+CREATE EXTENSION IF NOT EXISTS unaccent;"
 ynh_psql_execute_as_root "\connect $db_name 
-CREATE EXTENSION IF NOT EXISTS unaccent;CREATE EXTENSION IF NOT EXISTS citext;"
+CREATE EXTENSION IF NOT EXISTS pg_trgm;"
+ynh_psql_execute_as_root "\connect $db_name 
+CREATE EXTENSION IF NOT EXISTS citext;"
 ynh_psql_execute_file_as_root ./db.sql "$db_name"
 
 #=================================================

From 3135783df6203037932b569d3e93e76dd383f991 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Sun, 24 Feb 2019 17:41:40 +0100
Subject: [PATCH 11/12] Fix restore script for erlang and elixir

---
 scripts/restore | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/restore b/scripts/restore
index ca391e1..143a36d 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -95,12 +95,12 @@ chown -R "$app":"$app" "$final_path"
 ynh_print_info "Installing erlang and elixir ..."
 
 if [ "$(lsb_release --codename --short)" == "jessie" ]; then
-	sudo apt install -y ../sources/esl-erlang_21.2.6-1~debian~jessie_amd64.deb
-	sudo apt install -y ../sources/elixir_1.8.1-2~debian~jessie_amd64.deb
+	sudo apt install -y ../settings/sources/esl-erlang_21.2.6-1~debian~jessie_amd64.deb
+	sudo apt install -y ../settings/sources/elixir_1.8.1-2~debian~jessie_amd64.deb
 elif 
 	[ "$(lsb_release --codename --short)" == "stretch" ]; then
-	sudo apt install -y ../sources/esl-erlang_21.2.6-1~debian~stretch_amd64.deb
-	sudo apt install -y ../sources/elixir_1.8.1-2~debian~stretch_amd64.deb
+	sudo apt install -y ../settings/sources/esl-erlang_21.2.6-1~debian~stretch_amd64.deb
+	sudo apt install -y ../settings/sources/elixir_1.8.1-2~debian~stretch_amd64.deb
 fi
 
 #=================================================

From 68dd388246bbb5760e6219b6e03799ddc655c4e7 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Sun, 24 Feb 2019 19:07:50 +0100
Subject: [PATCH 12/12] Change .deb path

---
 scripts/install | 8 ++++----
 scripts/restore | 8 ++++----
 scripts/upgrade | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/scripts/install b/scripts/install
index 0fa213d..1dfa170 100755
--- a/scripts/install
+++ b/scripts/install
@@ -112,12 +112,12 @@ ynh_app_setting_set $app port $port
 ynh_print_info "Installing erlang and elixir ..."
 
 if [ "$(lsb_release --codename --short)" == "jessie" ]; then
-	sudo apt install -y ../sources/esl-erlang_21.2.6-1~debian~jessie_amd64.deb
-	sudo apt install -y ../sources/elixir_1.8.1-2~debian~jessie_amd64.deb
+	sudo apt install -y ../conf/esl-erlang_21.2.6-1~debian~jessie_amd64.deb
+	sudo apt install -y ../conf/elixir_1.8.1-2~debian~jessie_amd64.deb
 elif 
 	[ "$(lsb_release --codename --short)" == "stretch" ]; then
-	sudo apt install -y ../sources/esl-erlang_21.2.6-1~debian~stretch_amd64.deb
-	sudo apt install -y ../sources/elixir_1.8.1-2~debian~stretch_amd64.deb
+	sudo apt install -y ../conf/esl-erlang_21.2.6-1~debian~stretch_amd64.deb
+	sudo apt install -y ../conf/elixir_1.8.1-2~debian~stretch_amd64.deb
 fi
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 143a36d..55909ad 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -95,12 +95,12 @@ chown -R "$app":"$app" "$final_path"
 ynh_print_info "Installing erlang and elixir ..."
 
 if [ "$(lsb_release --codename --short)" == "jessie" ]; then
-	sudo apt install -y ../settings/sources/esl-erlang_21.2.6-1~debian~jessie_amd64.deb
-	sudo apt install -y ../settings/sources/elixir_1.8.1-2~debian~jessie_amd64.deb
+	sudo apt install -y ../settings/conf/esl-erlang_21.2.6-1~debian~jessie_amd64.deb
+	sudo apt install -y ../settings/conf/elixir_1.8.1-2~debian~jessie_amd64.deb
 elif 
 	[ "$(lsb_release --codename --short)" == "stretch" ]; then
-	sudo apt install -y ../settings/sources/esl-erlang_21.2.6-1~debian~stretch_amd64.deb
-	sudo apt install -y ../settings/sources/elixir_1.8.1-2~debian~stretch_amd64.deb
+	sudo apt install -y ../settings/conf/esl-erlang_21.2.6-1~debian~stretch_amd64.deb
+	sudo apt install -y ../settings/conf/elixir_1.8.1-2~debian~stretch_amd64.deb
 fi
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 9bc7acd..a5f14e1 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -138,12 +138,12 @@ fi
 ynh_print_info "Installing erlang and elixir ..."
 
 if [ "$(lsb_release --codename --short)" == "jessie" ]; then
-	sudo apt install -y ../sources/esl-erlang_21.2.6-1~debian~jessie_amd64.deb
-	sudo apt install -y ../sources/elixir_1.8.1-2~debian~jessie_amd64.deb
+	sudo apt install -y ../conf/esl-erlang_21.2.6-1~debian~jessie_amd64.deb
+	sudo apt install -y ../conf/elixir_1.8.1-2~debian~jessie_amd64.deb
 elif 
 	[ "$(lsb_release --codename --short)" == "stretch" ]; then
-	sudo apt install -y ../sources/esl-erlang_21.2.6-1~debian~stretch_amd64.deb
-	sudo apt install -y ../sources/elixir_1.8.1-2~debian~stretch_amd64.deb
+	sudo apt install -y ../conf/esl-erlang_21.2.6-1~debian~stretch_amd64.deb
+	sudo apt install -y ../conf/elixir_1.8.1-2~debian~stretch_amd64.deb
 fi
 
 #=================================================