diff options
| author | yalh76 <yalh@yahoo.com> | 2019-10-10 21:22:19 +0200 |
|---|---|---|
| committer | yalh76 <yalh@yahoo.com> | 2019-10-10 21:22:19 +0200 |
| commit | bbc6bbe91d0f4b42e83996079c37935ab1f6e553 (patch) | |
| tree | 10c5ada378aad9aa82406a4287dd07ec9f8dccfe /scripts | |
| parent | 7e8d2cee5094cafb77954489e75674a636bcc3af (diff) | |
| download | mastodon_ynh-bbc6bbe91d0f4b42e83996079c37935ab1f6e553.tar.gz mastodon_ynh-bbc6bbe91d0f4b42e83996079c37935ab1f6e553.tar.bz2 mastodon_ynh-bbc6bbe91d0f4b42e83996079c37935ab1f6e553.zip | |
Fix VAPID_KEY
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/install | 4 | ||||
| -rw-r--r-- | scripts/upgrade | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/scripts/install b/scripts/install index dafdfc8..2519364 100644 --- a/scripts/install +++ b/scripts/install @@ -199,8 +199,8 @@ popd admin_pass=$( tail -1 $final_path/live/acc.txt | head -1 | cut -c 15- ) ynh_secure_remove --file="$final_path/live/acc.txt" -vapid_private_key=$(grep -oP "VAPID_PRIVATE_KEY=\K\w+" "$final_path/live/key.txt") -vapid_public_key=$(grep -oP "VAPID_PUBLIC_KEY=\K\w+" "$final_path/live/key.txt") +vapid_private_key=$(grep -oP "VAPID_PRIVATE_KEY=\K.+" "$final_path/live/key.txt") +vapid_public_key=$(grep -oP "VAPID_PUBLIC_KEY=\K.+" "$final_path/live/key.txt") ynh_replace_string --match_string="__VAPID_PRIVATE_KEY__" --replace_string="$vapid_private_key" --target_file="${final_path}/live/.env.production" ynh_replace_string --match_string="__VAPID_PUBLIC_KEY__" --replace_string="$vapid_public_key" --target_file="${final_path}/live/.env.production" diff --git a/scripts/upgrade b/scripts/upgrade index 563b983..38d85ea 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -118,8 +118,8 @@ fi # If vapid_private_key doesn't exist, retrieve it or create it if [[ -z "$vapid_private_key" ]]; then - vapid_private_key=$(grep -oP "VAPID_PRIVATE_KEY=\K\w+" ${final_path}/live/.env.production) - vapid_public_key=$(grep -oP "VAPID_PUBLIC_KEY=\K\w+" ${final_path}/live/.env.production) + vapid_private_key=$(grep -oP "VAPID_PRIVATE_KEY=\K.+" ${final_path}/live/.env.production) + vapid_public_key=$(grep -oP "VAPID_PUBLIC_KEY=\K.+" ${final_path}/live/.env.production) ynh_app_setting_set "$app" vapid_private_key "$vapid_private_key" ynh_app_setting_set "$app" vapid_public_key "$vapid_public_key" fi @@ -281,8 +281,8 @@ popd # If vapid_private_key doesn't exist, retrieve it or create it #if [[ -z "$vapid_private_key" ]]; then # sudo -u "$app" env PATH=$PATH RAILS_ENV=production /opt/rbenv/versions/2.6.0/bin/bundle exec rake mastodon:webpush:generate_vapid_key > key.txt -# vapid_private_key=$(grep -oP "VAPID_PRIVATE_KEY=\K\w+" "$final_path/live/key.txt") -# vapid_public_key=$(grep -oP "VAPID_PUBLIC_KEY=\K\w+" "$final_path/live/key.txt") +# vapid_private_key=$(grep -oP "VAPID_PRIVATE_KEY=\K.+" "$final_path/live/key.txt") +# vapid_public_key=$(grep -oP "VAPID_PUBLIC_KEY=\K.+" "$final_path/live/key.txt") # ynh_app_setting_set "$app" vapid_private_key "$vapid_private_key" # ynh_app_setting_set "$app" vapid_public_key "$vapid_public_key" # ynh_secure_remove "$final_path/live/key.txt" |