From b8a5dccfd4ee106b2aede5cee1dd45de575416d9 Mon Sep 17 00:00:00 2001 From: anmol26s Date: Thu, 19 Nov 2020 14:41:49 +0530 Subject: [PATCH] Fixes in upgrade and typo in readme --- README.md | 1 + conf/nginx.conf | 6 +++--- scripts/install | 2 +- scripts/upgrade | 6 +++--- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 2f2b8e1..10aabe6 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # Firefly III for YunoHost [![Integration level](https://dash.yunohost.org/integration/firefly-iii.svg)](https://dash.yunohost.org/appci/app/firefly-iii) ![](https://ci-apps.yunohost.org/ci/badges/firefly-iii.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/firefly-iii.maintain.svg) + [![Install Firefly III with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=firefly-iii) > *This package allows you to install Firefly III quickly and simply on a YunoHost server. diff --git a/conf/nginx.conf b/conf/nginx.conf index 66184a3..8551053 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -22,18 +22,18 @@ location __PATH__/ { location ~ '[^/]\.php$|^/update.php' { fastcgi_split_path_info ^(.+?\.php)(/.*)$; fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; - + fastcgi_index index.php; include fastcgi_params; fastcgi_param REMOTE_USER $remote_user; fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param SCRIPT_FILENAME $request_filename; } - + # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; } location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + rewrite ^__PATH__/(.*)$ __PATH__/index.php?q=$1; } diff --git a/scripts/install b/scripts/install index fc67c25..1254103 100755 --- a/scripts/install +++ b/scripts/install @@ -119,7 +119,7 @@ ynh_exec_warn_less ynh_install_composer --phpversion="$phpversion" --workdir="$f ynh_script_progression --message="Modifying a config file..." config="$final_path/.env" -cp -f cp ../conf/.env "$config" +cp -f ../conf/.env "$config" ynh_replace_string --match_string="SomeRandomStringOf32CharsExactly" --replace_string="$random_key" --target_file="$config" ynh_replace_string --match_string="fireflyiiidb" --replace_string="127.0.0.1" --target_file="$config" diff --git a/scripts/upgrade b/scripts/upgrade index f38ca11..624ebfe 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -164,7 +164,7 @@ ynh_exec_warn_less ynh_install_composer --phpversion="$phpversion" --workdir="$f #================================================= # MODIFY A CONFIG FILE #================================================= -#ynh_script_progression --message="Modifying a config file..." +ynh_script_progression --message="Modifying a config file..." config="$final_path/.env" ynh_backup_if_checksum_is_different --file="$config" @@ -180,7 +180,7 @@ ynh_replace_string --match_string="MAIL_HOST=null" --replace_string="MAIL_HOST=1 ynh_replace_string --match_string="MAIL_PORT=2525" --replace_string="MAIL_PORT=25" --target_file="$config" ynh_replace_string --match_string="mail@example.com" --replace_string="$email" --target_file="$config" ynh_replace_string --match_string="changeme@example.com" --replace_string="$app@$domain" --target_file="$config" -# These helpers are for reference to impliment remove them once app gets support for LDAP. Put them directly in .env +# These helpers are for reference.Remove them once app gets support for LDAP. Put them directly in .env # ynh_replace_string --match_string="ADLDAP_CONTROLLERS=" --replace_string="ADLDAP_CONTROLLERS=127.0.0.1" --target_file="$config" # ynh_replace_string --match_string='ADLDAP_BASEDN=""' --replace_string='ADLDAP_BASEDN="dc=yunohost,dc=org"' --target_file="$config" @@ -204,7 +204,7 @@ pushd "$final_path" php$phpversion artisan migrate:refresh --seed php$phpversion artisan firefly-iii:upgrade-database php$phpversion artisan passport:install - php artisan cache:clear + php$phpversion artisan cache:clear #rm -rf "$final_path/bootstrap/cache/*"