diff --git a/check_process b/check_process index b3002dc..5ae8b13 100644 --- a/check_process +++ b/check_process @@ -8,9 +8,7 @@ domain="domain.tld" path="/SOGo" admin="john" - language="French" is_public=1 - port="20000" ; Checks pkg_linter=1 setup_sub_dir=1 diff --git a/scripts/install b/scripts/install index 781dfb5..cffd8d4 100755 --- a/scripts/install +++ b/scripts/install @@ -58,10 +58,10 @@ ynh_app_setting_set --app=$app --key=is_public --value=$is_public #================================================= ynh_script_progression --message="Finding an available port..." --weight=1 -port=$(ynh_find_port --port 20000) +port=$(ynh_find_port --port=20000) ynh_app_setting_set --app=$app --key=web_port --value=$port -smtp_port=$(ynh_find_port --port $((port+1))) +smtp_port=$(ynh_find_port --port=$((port+1))) ynh_app_setting_set --app=$app --key=smtp_port --value=$smtp_port #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 61be0dd..74f1398 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -68,41 +68,27 @@ if [[ -z $port ]] then # Find a port for SOGo port=$(ynh_find_port --port 20000) - ynh_app_setting_set --app $app --key web_port --value $port + ynh_app_setting_set --app=$app --key=web_port --value=$port fi if [[ -z $db_name ]] then db_name=$app - ynh_app_setting_set --app $app --key db_name --value $db_name + ynh_app_setting_set --app=$app --key=db_name --value=$db_name fi if [[ -z $db_user ]] then db_user=$app - ynh_app_setting_set --app $app --key db_user --value $db_user -fi - -# Manage migration form SOGo 3.x to SOGo 4.x (Debian stretch -> Buster) -ynh_script_progression --message="Migrating database if needed..." - -# FIXME use the new way to manage version when available on the core -app_previous_version="$(jq -r .version /etc/yunohost/apps/$app/manifest.json | cut -d~ -f1)" -if [[ "$app_previous_version" == 3.2.* ]]; then - ynh_replace_string --match_string __APP__ --replace_string $app --target_file migrations/3.2-4.0.sh - ynh_replace_string --match_string __DBUSER__ --replace_string $db_user --target_file migrations/3.2-4.0.sh - ynh_replace_string --match_string __DBPASS__ --replace_string $db_pwd --target_file migrations/3.2-4.0.sh - bash migrations/3.2-4.0.sh + ynh_app_setting_set --app=$app --key=db_user --value=$db_user fi #================================================= # STANDARD MODIFICATIONS -#================================================= - #================================================= # UPGRADE DEPENDENCIES #================================================= -ynh_script_progression --message="Upgrading dependencies..." --time --weight=1 +ynh_script_progression --message="Upgrading dependencies..." --weight=1 ynh_install_app_dependencies $pkg_dependencies