diff --git a/issue_template.md b/.github/ISSUE_TEMPLATE.md similarity index 94% rename from issue_template.md rename to .github/ISSUE_TEMPLATE.md index faf5143..2729a6b 100644 --- a/issue_template.md +++ b/.github/ISSUE_TEMPLATE.md @@ -8,7 +8,7 @@ about: When creating a bug report, please use the following template to provide 1. *Read this whole template first.* 2. *Determine if you are on the right place:* - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!* - - *Otherwise, the issue may be due to Funkwhale itself. Refer to its documentation or repository for help.* + - *Otherwise, the issue may be due to the app itself. Refer to its documentation or repository for help.* - *When in doubt, post here and we will figure it out together.* 3. *Delete the italic comments as you write over them below, and remove this guide.* --- @@ -31,7 +31,7 @@ about: When creating a bug report, please use the following template to provide - *If you performed a command from the CLI, the command itself is enough. For example:* ```sh - sudo yunohost app install funkwhale + sudo yunohost app install the_app ``` - *If you used the webadmin, please perform the equivalent command from the CLI first.* - *If the error occurs in your browser, explain what you did:* diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..ef70e18 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,16 @@ +## Problem + +- *Description of why you made this PR* + +## Solution + +- *And how do you fix that problem* + +## PR Status + +- [ ] Code finished and ready to be reviewed/tested +- [ ] The fix/enhancement were manually tested (if applicable) + +## Automatic tests + +Automatic tests can be triggered on https://ci-apps-dev.yunohost.org/ *after creating the PR*, by commenting "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!". (N.B. : for this to work you need to be a member of the Yunohost-Apps organization) diff --git a/README.md b/README.md index 5d3d9d0..e1b4e6f 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ A modern, convivial and free music server on YunoHost Installation requires a dedicated domain or subdomain. Installing in a subpath is not supported by the upstream project due to dependency requirements. -**Shipped version:** 1.1.1 +**Shipped version:** 1.1.2 ## Screenshots diff --git a/README_fr.md b/README_fr.md index b99c61e..a61b722 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Un serveur de musique moderne, convivial et gratuit sur YunoHost L'installation nécessite un domaine ou un sous-domaine dédié. L'installation dans un chemin du domaine n'est pas prise en charge par le projet en amont en raison des exigences de dépendance. -**Version incluse :** 1.1.1 +**Version incluse :** 1.1.2 ## Captures d'écran 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/conf/api.src b/conf/api.src index 2f4f89c..d2878e9 100644 --- a/conf/api.src +++ b/conf/api.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/-/jobs/artifacts/1.1.1/download?job=build_api -SOURCE_SUM=c77ebc37378df26a621f5f702fad3f94b56207bbfd69001bda4b45bcda515332 +SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/-/jobs/artifacts/1.1.2/download?job=build_api +SOURCE_SUM=a0057edcff716327e49eafe7cff95e64919f8e6f32541525cc1462a25097635e SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=api_1.1.1.zip +SOURCE_FILENAME=api_master.zip SOURCE_EXTRACT=true diff --git a/conf/front.src b/conf/front.src index 7b550d4..23c8cff 100644 --- a/conf/front.src +++ b/conf/front.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/builds/artifacts/1.1.1/download?job=build_front -SOURCE_SUM=d94f0deaa88b8d90dd10b363cf817a80f9d2822419e8bbc7282bacd27351127b +SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/builds/artifacts/1.1.2/download?job=build_front +SOURCE_SUM=746f204834faba05a10104223509d8d012d989a98510b73b232d8ebcd17dddf3 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=front_1.1.1.zip +SOURCE_FILENAME=front_master.zip SOURCE_EXTRACT=true diff --git a/manifest.json b/manifest.json index 08991a5..4389aff 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.2~ynh1", "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/pull_request_template.md b/pull_request_template.md deleted file mode 100644 index 6c28fc5..0000000 --- a/pull_request_template.md +++ /dev/null @@ -1,16 +0,0 @@ -## Problem -- *Description of why you made this PR* - -## Solution -- *And how do you fix that problem* - -## PR Status -- [ ] Code finished. -- [ ] Tested with Package_check. -- [ ] Fix or enhancement tested. -- [ ] Upgrade from last version tested. -- [ ] Can be reviewed and tested. - -## Package_check results ---- -* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"* 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