From dcb6b7779cda351fd9eb455d3f355d14ed08f18a Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 12 Feb 2019 09:34:21 +0100 Subject: [PATCH] Fix web_push --- conf/generated_config.exs | 2 +- scripts/install | 4 ++-- scripts/upgrade | 6 ++++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/conf/generated_config.exs b/conf/generated_config.exs index 6b7eebe..aeba221 100644 --- a/conf/generated_config.exs +++ b/conf/generated_config.exs @@ -70,4 +70,4 @@ config :pleroma, Pleroma.Repo, # object_url: "https://cdn-endpoint.provider.com/" # - +import_config "prod.secret.web_push.exs" diff --git a/scripts/install b/scripts/install index 90ecb2f..51b4193 100755 --- a/scripts/install +++ b/scripts/install @@ -277,8 +277,8 @@ pushd $final_path/$app 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.exs" - ynh_replace_string "administrator@example.com" "$admin_email" "$final_path/$app/config/prod.secret.exs" + 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 eba2803..a2f362f 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -215,6 +215,12 @@ 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 popd ### Verify the checksum of a file, stored by `ynh_store_file_checksum` in the install script.