From a8f3e6e8bf174f857b311b19232ceb9ec54a277a Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Tue, 12 Feb 2019 09:41:24 +0100
Subject: [PATCH] Fix Key Gen

---
 scripts/install | 8 ++++----
 scripts/upgrade | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/install b/scripts/install
index 51b4193..72c67a6 100755
--- a/scripts/install
+++ b/scripts/install
@@ -267,6 +267,10 @@ fi
 chown -R "$app":"$app" "$final_path"
 
 pushd $final_path/$app
+	#Generate key pair
+    sudo -u "$app" MIX_ENV=prod mix web_push.gen.keypair >> "config/prod.secret.web_push.exs"
+	ynh_replace_string "administrator@example.com" "$admin_email" "$final_path/$app/config/prod.secret.web_push.exs" 
+	
     # App setup and db migration
     sudo -u "$app" MIX_ENV=prod mix local.hex --force
     sudo -u "$app" MIX_ENV=prod mix local.rebar --force
@@ -275,10 +279,6 @@ pushd $final_path/$app
 
     # Add user
     sudo -u "$app" MIX_ENV=prod mix pleroma.user new "$admin" "$admin_email" --password "$password" --moderator --admin -y
-
-	#Generate key pair
-    sudo -u "$app" MIX_ENV=prod mix web_push.gen.keypair >> "config/prod.secret.web_push.exs"
-	ynh_replace_string "administrator@example.com" "$admin_email" "$final_path/$app/config/prod.secret.web_push.exs" 
 popd
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index a2f362f..c227a6d 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -213,14 +213,14 @@ fi
 # Give permission to the final_path
 chown -R "$app":"$app" "$final_path"
 pushd $final_path/$app
-    sudo -u "$app" MIX_ENV=prod mix deps.get
-    sudo -u "$app" MIX_ENV=prod mix ecto.migrate --force
 	if [ ! -f "$final_path/$app/config/prod.secret.web_push.exs" ]
 	then
 		#Generate key pair
 	    sudo -u "$app" MIX_ENV=prod mix web_push.gen.keypair >> "config/prod.secret.web_push.exs"
 		ynh_replace_string "administrator@example.com" "$admin_email" "$final_path/$app/config/prod.secret.web_push.exs" 
 	fi
+    sudo -u "$app" MIX_ENV=prod mix deps.get
+    sudo -u "$app" MIX_ENV=prod mix ecto.migrate --force
 popd
 
 ### Verify the checksum of a file, stored by `ynh_store_file_checksum` in the install script.