From 4b8af75f74f2b2415744e91fd497d1d157eb994a Mon Sep 17 00:00:00 2001 From: anmol26s Date: Tue, 9 Oct 2018 07:09:23 +0530 Subject: [PATCH] Run php artisan passport:install for the app config --- scripts/install | 3 ++- scripts/upgrade | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index a6e7d86..a3f5b05 100755 --- a/scripts/install +++ b/scripts/install @@ -135,6 +135,7 @@ ynh_replace_string "language" "$language" "$final_path/.env" # setup application config ( cd $final_path && sudo /usr/bin/php7.1 artisan monica:update --force ) +( cd $final_path && sudo /usr/bin/php7.1 artisan passport:install ) ( cd $final_path && sudo /usr/bin/php7.1 artisan passport:client --password -n > key.txt ) mobile_id=$( cd $final_path && tail -2 key.txt | head -1 | cut -c 12- ) mobile_key=$( cd $final_path && tail -1 key.txt | cut -c 16- ) @@ -143,7 +144,7 @@ ynh_replace_string "__KEY__" "$mobile_key" "$final_path/.env" ynh_app_setting_set $app mobile_id $mobile_id ynh_app_setting_set $app mobile_key $mobile_key (cd $final_path && rm -f key.txt) -(cd $final_path && sudo /usr/bin/php7.1 artisan monica:update --force) + # create a cronjob to run the scheduler echo "* * * * * -u $app /usr/bin/php7.1 $final_path/artisan schedule:run" > /tmp/cron$app diff --git a/scripts/upgrade b/scripts/upgrade index 39236a0..0e531d1 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -125,7 +125,10 @@ cd $final_path && sudo /usr/bin/php7.1 artisan monica:update --force if [ -f $final_path/storage/oauth-private.key ]; then mobile_id=$(ynh_app_setting_get $app mobile_id) mobile_key=$(ynh_app_setting_get $app mobile_key) + ynh_replace_string "__IDENTITY__" "$mobile_id" "$final_path/.env" + ynh_replace_string "__KEY__" "$mobile_key" "$final_path/.env" else + ( cd $final_path && sudo /usr/bin/php7.1 artisan passport:install ) ( cd $final_path && sudo /usr/bin/php7.1 artisan passport:client --password -n > key.txt ) mobile_id=$( cd $final_path && tail -2 key.txt | head -1 | cut -c 12- ) mobile_key=$( cd $final_path && tail -1 key.txt | cut -c 16- ) @@ -134,7 +137,6 @@ else ynh_app_setting_set $app mobile_id $mobile_id ynh_app_setting_set $app mobile_key $mobile_key (cd $final_path && rm -f key.txt) - (cd $final_path && sudo /usr/bin/php7.1 artisan monica:update --force) fi #================================================= # GENERIC FINALIZATION