From 61a4df5143ff45e42109b80dc732856a7dc2a59e Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 29 Jun 2021 22:30:48 +0200 Subject: [PATCH 1/5] Fix bullseye dependencies --- scripts/_common.sh | 1 + scripts/install | 9 +++++++-- scripts/restore | 9 +++++++-- scripts/upgrade | 9 +++++++-- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 9c7a7b7..835a497 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,6 +7,7 @@ # dependencies used by the app pkg_dependencies="build-essential inotify-tools postgresql postgresql-client postgresql-contrib postgis postgresql-postgis-scripts git curl unzip gnupg openssl make gcc libc-dev argon2 imagemagick webp gifsicle jpegoptim optipng pngquant cmake" extra_pkg_dependencies="elixir esl-erlang" +extra_debian_pkg_dependencies="elixir erlang-dev erlang-nox" NODEJS_VERSION=14 diff --git a/scripts/install b/scripts/install index d66b0ca..001c80e 100644 --- a/scripts/install +++ b/scripts/install @@ -79,8 +79,13 @@ ynh_install_nodejs --nodejs_version=$NODEJS_VERSION ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key='https://dl.yarnpkg.com/debian/pubkey.gpg' -lsb_name="$(lsb_release --codename --short)" -ynh_install_extra_app_dependencies --repo="deb http://packages.erlang-solutions.com/debian $lsb_name contrib" --package="$extra_pkg_dependencies" --key='https://packages.erlang-solutions.com/debian/erlang_solutions.asc' +if $(dpkg --compare-versions $(cat /etc/debian_version) gt "11.0") +then + ynh_add_app_dependencies --package=$extra_debian_pkg_dependencies +else + lsb_name="$(lsb_release --codename --short)" + ynh_install_extra_app_dependencies --repo="deb http://packages.erlang-solutions.com/debian $lsb_name contrib" --package="$extra_pkg_dependencies" --key='https://packages.erlang-solutions.com/debian/erlang_solutions.asc' +fi #================================================= # CREATE DEDICATED USER diff --git a/scripts/restore b/scripts/restore index 147bb5d..f2be272 100644 --- a/scripts/restore +++ b/scripts/restore @@ -109,8 +109,13 @@ ynh_install_nodejs --nodejs_version=$NODEJS_VERSION ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key='https://dl.yarnpkg.com/debian/pubkey.gpg' -lsb_name="$(lsb_release --codename --short)" -ynh_install_extra_app_dependencies --repo="deb http://packages.erlang-solutions.com/debian $lsb_name contrib" --package="$extra_pkg_dependencies" --key='https://packages.erlang-solutions.com/debian/erlang_solutions.asc' +if $(dpkg --compare-versions $(cat /etc/debian_version) gt "11.0") +then + ynh_add_app_dependencies --package=$extra_debian_pkg_dependencies +else + lsb_name="$(lsb_release --codename --short)" + ynh_install_extra_app_dependencies --repo="deb http://packages.erlang-solutions.com/debian $lsb_name contrib" --package="$extra_pkg_dependencies" --key='https://packages.erlang-solutions.com/debian/erlang_solutions.asc' +fi #================================================= # RESTORE THE POSTGRESQL DATABASE diff --git a/scripts/upgrade b/scripts/upgrade index 4604a14..6511b16 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -214,8 +214,13 @@ ynh_install_app_dependencies $pkg_dependencies ynh_remove_nodejs ynh_install_nodejs --nodejs_version=$NODEJS_VERSION -lsb_name="$(lsb_release --codename --short)" -ynh_install_extra_app_dependencies --repo="deb http://packages.erlang-solutions.com/debian $lsb_name contrib" --package="$extra_pkg_dependencies" --key='https://packages.erlang-solutions.com/debian/erlang_solutions.asc' +if $(dpkg --compare-versions $(cat /etc/debian_version) gt "11.0") +then + ynh_add_app_dependencies --package=$extra_debian_pkg_dependencies +else + lsb_name="$(lsb_release --codename --short)" + ynh_install_extra_app_dependencies --repo="deb http://packages.erlang-solutions.com/debian $lsb_name contrib" --package="$extra_pkg_dependencies" --key='https://packages.erlang-solutions.com/debian/erlang_solutions.asc' +fi #================================================= # SPECIFIC UPGRADE From 3bd3f8c2cd3200ac1a196b8e18b4c1d831a02103 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 30 Jun 2021 22:59:04 +0200 Subject: [PATCH 2/5] Fix bullseye --- scripts/install | 4 ++-- scripts/restore | 2 +- scripts/upgrade | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 001c80e..16750d9 100644 --- a/scripts/install +++ b/scripts/install @@ -79,7 +79,7 @@ ynh_install_nodejs --nodejs_version=$NODEJS_VERSION ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key='https://dl.yarnpkg.com/debian/pubkey.gpg' -if $(dpkg --compare-versions $(cat /etc/debian_version) gt "11.0") +if dpkg --compare-versions $(cat /etc/debian_version) ge 11.0 then ynh_add_app_dependencies --package=$extra_debian_pkg_dependencies else @@ -95,7 +95,7 @@ ynh_script_progression --message="Configuring system user..." # Create a system user ynh_system_user_create --username=$app --home_dir="$final_path" -yunohost user create ${app}_notifs --firstname "Mobilizon" --lastname "Notifications" --mail ${app}_notifs@$domain --password "$ynh_user_password" -q 0 +yunohost user create ${app}_notifs --firstname "Mobilizon" --lastname "Notifications" --domain "$domain" --password "$ynh_user_password" -q 0 yunohost user update ${app}_notifs --add-mailalias $app@$domain --add-mailforward $admin_email #================================================= diff --git a/scripts/restore b/scripts/restore index f2be272..438c3b9 100644 --- a/scripts/restore +++ b/scripts/restore @@ -109,7 +109,7 @@ ynh_install_nodejs --nodejs_version=$NODEJS_VERSION ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key='https://dl.yarnpkg.com/debian/pubkey.gpg' -if $(dpkg --compare-versions $(cat /etc/debian_version) gt "11.0") +if dpkg --compare-versions $(cat /etc/debian_version) ge 11.0 then ynh_add_app_dependencies --package=$extra_debian_pkg_dependencies else diff --git a/scripts/upgrade b/scripts/upgrade index 6511b16..d98065c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -214,7 +214,7 @@ ynh_install_app_dependencies $pkg_dependencies ynh_remove_nodejs ynh_install_nodejs --nodejs_version=$NODEJS_VERSION -if $(dpkg --compare-versions $(cat /etc/debian_version) gt "11.0") +if dpkg --compare-versions $(cat /etc/debian_version) ge 11.0 then ynh_add_app_dependencies --package=$extra_debian_pkg_dependencies else From bbf6b2fc5785e198d7f2ae602603865bf5e10ca4 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 2 Jul 2021 00:52:16 +0200 Subject: [PATCH 3/5] Fix elixir for buster --- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 16750d9..c85767b 100644 --- a/scripts/install +++ b/scripts/install @@ -81,7 +81,7 @@ ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ st if dpkg --compare-versions $(cat /etc/debian_version) ge 11.0 then - ynh_add_app_dependencies --package=$extra_debian_pkg_dependencies + ynh_install_extra_app_dependencies --repo="deb http://packages.erlang-solutions.com/debian buster contrib" --package="$extra_pkg_dependencies" --key='https://packages.erlang-solutions.com/debian/erlang_solutions.asc' else lsb_name="$(lsb_release --codename --short)" ynh_install_extra_app_dependencies --repo="deb http://packages.erlang-solutions.com/debian $lsb_name contrib" --package="$extra_pkg_dependencies" --key='https://packages.erlang-solutions.com/debian/erlang_solutions.asc' diff --git a/scripts/restore b/scripts/restore index 438c3b9..11af6b9 100644 --- a/scripts/restore +++ b/scripts/restore @@ -111,7 +111,7 @@ ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ st if dpkg --compare-versions $(cat /etc/debian_version) ge 11.0 then - ynh_add_app_dependencies --package=$extra_debian_pkg_dependencies + ynh_install_extra_app_dependencies --repo="deb http://packages.erlang-solutions.com/debian buster contrib" --package="$extra_pkg_dependencies" --key='https://packages.erlang-solutions.com/debian/erlang_solutions.asc' else lsb_name="$(lsb_release --codename --short)" ynh_install_extra_app_dependencies --repo="deb http://packages.erlang-solutions.com/debian $lsb_name contrib" --package="$extra_pkg_dependencies" --key='https://packages.erlang-solutions.com/debian/erlang_solutions.asc' diff --git a/scripts/upgrade b/scripts/upgrade index d98065c..9289772 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -211,12 +211,13 @@ ynh_script_progression --message="Upgrading dependencies..." ynh_install_app_dependencies $pkg_dependencies -ynh_remove_nodejs ynh_install_nodejs --nodejs_version=$NODEJS_VERSION +ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key='https://dl.yarnpkg.com/debian/pubkey.gpg' + if dpkg --compare-versions $(cat /etc/debian_version) ge 11.0 then - ynh_add_app_dependencies --package=$extra_debian_pkg_dependencies + ynh_install_extra_app_dependencies --repo="deb http://packages.erlang-solutions.com/debian buster contrib" --package="$extra_pkg_dependencies" --key='https://packages.erlang-solutions.com/debian/erlang_solutions.asc' else lsb_name="$(lsb_release --codename --short)" ynh_install_extra_app_dependencies --repo="deb http://packages.erlang-solutions.com/debian $lsb_name contrib" --package="$extra_pkg_dependencies" --key='https://packages.erlang-solutions.com/debian/erlang_solutions.asc' From 1a4f6469c5e3f923f128a3aa3198dded29ccc0b0 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 2 Jul 2021 19:10:15 +0200 Subject: [PATCH 4/5] remove check upgrade from previous version --- check_process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_process b/check_process index b1bba6f..2cc8994 100644 --- a/check_process +++ b/check_process @@ -15,7 +15,7 @@ setup_public=1 upgrade=1 # 1.1.3~ynh1 - upgrade=1 from_commit=87d34001dd0b77aed4fa7be2911bc04f58b069ee + #upgrade=1 from_commit=87d34001dd0b77aed4fa7be2911bc04f58b069ee backup_restore=1 multi_instance=1 port_already_use=0 From 4925d7800c5ad54928701504a4d67220ab0370aa Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 3 Jul 2021 01:19:07 +0200 Subject: [PATCH 5/5] fix restore --- scripts/restore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index 11af6b9..68d8a14 100644 --- a/scripts/restore +++ b/scripts/restore @@ -65,7 +65,7 @@ ynh_script_progression --message="Recreating the dedicated system user..." # Create the dedicated user (if not existing) ynh_system_user_create --username=$app --home_dir="$final_path" -yunohost user create ${app}_notifs --firstname "Mobilizon" --lastname "Notifications" --mail ${app}_notifs@$domain --password "$ynh_user_password" -q 0 +yunohost user create ${app}_notifs --firstname "Mobilizon" --lastname "Notifications" --domain "$domain" --password "$ynh_user_password" -q 0 yunohost user update ${app}_notifs --add-mailalias $app@$domain --add-mailforward $admin_email #=================================================