diff --git a/check_process b/check_process index ea05a96..de19364 100644 --- a/check_process +++ b/check_process @@ -19,7 +19,9 @@ # 0.19.1 upgrade=1 from_commit=4d4bf0981e2d3a00eaae6b19bd54344fe55d6530 # 1.1~ynh1 - upgrade=1 from_commit=8172790fb461d16f09089593fdac380f0d499c83 + upgrade=1 from_commit=8172790fb461d16f09089593fdac380f0d499c83 + # 1.1.1~ynh1 + upgrade=1 from_commit=fa9587f61e4bb4f9db8667b1c6701ede37ac8e91 backup_restore=1 multi_instance=1 incorrect_path=0 @@ -34,3 +36,5 @@ Notification=all manifest_arg=domain=DOMAIN&path=/&admin=USER&is_public=1 ; commit=8172790fb461d16f09089593fdac380f0d499c83 name=1.1~ynh1 + ; commit=fa9587f61e4bb4f9db8667b1c6701ede37ac8e91 + name=1.1.1~ynh1 diff --git a/manifest.json b/manifest.json index 08991a5..d4b73ce 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Modern, convivial and free music server", "fr": "Serveur de musique moderne, convivial et gratuit" }, - "version": "1.1.1~ynh1", + "version": "1.1.1~ynh2", "url": "https://funkwhale.audio", "license": "AGPL-3.0-or-later", "maintainer": { @@ -18,7 +18,7 @@ "email": "jean-baptiste@holcroft.fr" }], "requirements": { - "yunohost": ">= 4.1.3" + "yunohost": ">= 4.2.0" }, "multi_instance": true, "services": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index 9916587..dc8c79b 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -63,64 +63,3 @@ ynh_redis_remove_db() { local db=$1 redis-cli -n "$db" flushall } - -# Send an email to inform the administrator -# -# usage: ynh_send_readme_to_admin app_message [recipients] -# | arg: app_message - The message to send to the administrator. -# | arg: recipients - The recipients of this email. Use spaces to separate multiples recipients. - default: root -# example: "root admin@domain" -# If you give the name of a YunoHost user, ynh_send_readme_to_admin will find its email adress for you -# example: "root admin@domain user1 user2" -ynh_send_readme_to_admin() { - local app_message="${1:-...No specific information...}" - local recipients="${2:-root}" - - # Retrieve the email of users - find_mails () { - local list_mails="$1" - local mail - local recipients=" " - # Read each mail in argument - for mail in $list_mails - do - # Keep root or a real email address as it is - if [ "$mail" = "root" ] || echo "$mail" | grep --quiet "@" - then - recipients="$recipients $mail" - else - # But replace an user name without a domain after by its email - if mail=$(ynh_user_get_info "$mail" "mail" 2> /dev/null) - then - recipients="$recipients $mail" - fi - fi - done - echo "$recipients" - } - recipients=$(find_mails "$recipients") - - local mail_subject="☁️🆈🅽🅷☁️: \`$app\` was just installed!" - - local mail_message="This is an automated message from your beloved YunoHost server. - -Specific information for the application $app. - -$app_message - ---- -Automatic diagnosis data from YunoHost - -$(yunohost tools diagnosis | grep -B 100 "services:" | sed '/services:/d')" - - # Define binary to use for mail command - if [ -e /usr/bin/bsd-mailx ] - then - local mail_bin=/usr/bin/bsd-mailx - else - local mail_bin=/usr/bin/mail.mailutils - fi - - # Send the email to the recipients - echo "$mail_message" | $mail_bin -a "Content-Type: text/plain; charset=UTF-8" -s "$mail_subject" "$recipients" -} diff --git a/scripts/install b/scripts/install index bf0e8cb..08c4709 100644 --- a/scripts/install +++ b/scripts/install @@ -158,9 +158,9 @@ ynh_script_progression --message="Configuring a systemd service..." ynh_add_config --template="../conf/funkwhale.target" --destination="/etc/systemd/system/$app.target" # Create a dedicated systemd config -ynh_add_systemd_config --service="${app}-server" --template="funkwhale-server.service" --others_var="datadir" -ynh_add_systemd_config --service="${app}-worker" --template="funkwhale-worker.service" --others_var="datadir" -ynh_add_systemd_config --service="${app}-beat" --template="funkwhale-beat.service" --others_var="datadir" +ynh_add_systemd_config --service="${app}-server" --template="funkwhale-server.service" +ynh_add_systemd_config --service="${app}-worker" --template="funkwhale-worker.service" +ynh_add_systemd_config --service="${app}-beat" --template="funkwhale-beat.service" #================================================= # INSTALL PYTHON DEPENDENCIES diff --git a/scripts/upgrade b/scripts/upgrade index aa21fd0..60e2228 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -265,9 +265,9 @@ ynh_script_progression --message="Upgrading systemd configuration..." ynh_add_config --template="../conf/funkwhale.target" --destination="/etc/systemd/system/$app.target" # Create a dedicated systemd config -ynh_add_systemd_config --service="${app}-server" --template="funkwhale-server.service" --others_var="datadir" -ynh_add_systemd_config --service="${app}-worker" --template="funkwhale-worker.service" --others_var="datadir" -ynh_add_systemd_config --service="${app}-beat" --template="funkwhale-beat.service" --others_var="datadir" +ynh_add_systemd_config --service="${app}-server" --template="funkwhale-server.service" +ynh_add_systemd_config --service="${app}-worker" --template="funkwhale-worker.service" +ynh_add_systemd_config --service="${app}-beat" --template="funkwhale-beat.service" #================================================= # GENERIC FINALIZATION