diff --git a/check_process b/check_process index 30beca2..db9a3ce 100644 --- a/check_process +++ b/check_process @@ -18,7 +18,6 @@ setup_private=1 setup_public=1 upgrade=1 - upgrade=1 from_commit=eb54592d2d618c43751a0353c8946f4ba3d15207 backup_restore=1 multi_instance=0 port_already_use=0 @@ -27,6 +26,6 @@ Email= Notification=none ;;; Upgrade options - ; commit=eb54592d2d618c43751a0353c8946f4ba3d15207 - name=Testing (#20) + ; commit= + name= manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=phrasedepasse&port=9537& diff --git a/scripts/install b/scripts/install index df84635..2c1c9e7 100644 --- a/scripts/install +++ b/scripts/install @@ -48,7 +48,6 @@ ynh_script_progression --message="Storing installation settings..." --weight=2 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=admin --value=$admin -ynh_app_setting_set --app=$app --key=password --value=$password #================================================= # STANDARD MODIFICATIONS @@ -131,7 +130,7 @@ ynh_store_file_checksum --file="$final_path/config/db.inc.php" #================================================= # Install PHP dependencies using composer #================================================= -ynh_script_progression --message="Configuring Composer ..." --weight=1 +ynh_script_progression --message="Configuring Composer..." --weight=1 pushd $final_path export COMPOSER_HOME=$final_path diff --git a/scripts/upgrade b/scripts/upgrade index 62a41a6..7a553be 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -24,8 +24,6 @@ is_public=$(ynh_app_setting_get --app=$app --key=is_public) final_path=$(ynh_app_setting_get --app=$app --key=final_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) -admin=$(ynh_app_setting_get --app=$app --key=admin) -password=$(ynh_app_setting_get --app=$app --key=password) phpversion=$(ynh_app_setting_get --app="$app" --key=phpversion) timezone=$(cat /etc/timezone) @@ -160,12 +158,9 @@ pushd "$final_path" ynh_exec_warn_less curl -sS https://getcomposer.org/installer | php$phpversion -- --version="1.10.16" --install-dir="$final_path" \ && php$phpversion composer.phar config --global discard-changes true --quiet \ && php$phpversion composer.phar update --no-interaction --quiet \ - && php$phpversion composer.phar movim:migrate --quiet \ - && php$phpversion daemon.php config --username=$admin --password=$password --quiet + && php$phpversion composer.phar movim:migrate --quiet popd -#&& php$phpversion composer.phar install --no-interaction --quiet \ - #================================================= # SETUP SYSTEMD #=================================================