From 22445f018b70ed1a89593107afff498b672f93ad Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Thu, 13 Jan 2022 22:41:34 +0000 Subject: [PATCH 1/3] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index acbf9f6..c1d0502 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Bazarr is a companion application to Sonarr and Radarr that manages and download ## Screenshots -![](./doc/screenshots/example.jpg) +![](./doc/screenshots/bazarr.png) ## Disclaimers / important information diff --git a/README_fr.md b/README_fr.md index 6ecba37..36e4517 100644 --- a/README_fr.md +++ b/README_fr.md @@ -26,7 +26,7 @@ Bazarr is a companion application to Sonarr and Radarr that manages and download ## Captures d'écran -![](./doc/screenshots/example.jpg) +![](./doc/screenshots/bazarr.png) ## Avertissements / informations importantes From 4aeaf17b8ba54bc7ca028f77cd39be28bcb22ba8 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 27 Jan 2022 01:01:59 +0100 Subject: [PATCH 2/3] Apply example_ynh --- check_process | 5 ----- manifest.json | 2 +- scripts/backup | 1 - scripts/install | 17 ++++++++--------- scripts/remove | 16 ++++++++-------- scripts/restore | 1 - scripts/upgrade | 7 +------ 7 files changed, 18 insertions(+), 31 deletions(-) diff --git a/check_process b/check_process index 773d794..91bf1eb 100644 --- a/check_process +++ b/check_process @@ -1,8 +1,3 @@ -# See here for more information -# https://github.com/YunoHost/package_check#syntax-check_process-file - -# Move this file from check_process.default to check_process when you have filled it. - ;; Test complet ; pre-install # sudo yunohost domain add arr.domain.tld diff --git a/manifest.json b/manifest.json index e6fd98e..d7fc503 100644 --- a/manifest.json +++ b/manifest.json @@ -27,7 +27,7 @@ "nginx" ], "arguments": { - "install" : [ + "install": [ { "name": "domain", "type": "domain" diff --git a/scripts/backup b/scripts/backup index e5c8f14..f146115 100755 --- a/scripts/backup +++ b/scripts/backup @@ -15,7 +15,6 @@ source /usr/share/yunohost/helpers #================================================= ynh_clean_setup () { - ### Remove this function if there's nothing to clean before calling the remove script. true } # Exit if an error occurs during the execution of the script diff --git a/scripts/install b/scripts/install index a7a5ef7..d922745 100755 --- a/scripts/install +++ b/scripts/install @@ -14,7 +14,6 @@ source /usr/share/yunohost/helpers #================================================= ynh_clean_setup () { - ### Remove this function if there's nothing to clean before calling the remove script. true } # Exit if an error occurs during the execution of the script @@ -117,14 +116,6 @@ pushd $final_path ynh_exec_as $app $final_path/venv/bin/pip install -r "$final_path/requirements.txt" popd -#================================================= -# SETUP SYSTEMD -#================================================= -ynh_script_progression --message="Configuring a systemd service..." --weight=1 - -# Create a dedicated systemd config -ynh_add_systemd_config - #================================================= # ADD A CONFIGURATION #================================================= @@ -148,6 +139,14 @@ ynh_add_config --template="config.ini" --destination="$final_path/data/config/co chmod 660 "$final_path/data/config/config.ini" chown $app: "$final_path/data/config/config.ini" +#================================================= +# SETUP SYSTEMD +#================================================= +ynh_script_progression --message="Configuring a systemd service..." --weight=1 + +# Create a dedicated systemd config +ynh_add_systemd_config + #================================================= # YUNOHOST MULTIMEDIA INTEGRATION #================================================= diff --git a/scripts/remove b/scripts/remove index 1333f92..de9425f 100755 --- a/scripts/remove +++ b/scripts/remove @@ -49,14 +49,6 @@ ynh_script_progression --message="Removing logrotate configuration..." --weight= # Remove the app-specific logrotate config ynh_remove_logrotate -#================================================= -# REMOVE DEPENDENCIES -#================================================= -ynh_script_progression --message="Removing dependencies..." --weight=2 - -# Remove metapackage and its dependencies -ynh_remove_app_dependencies - #================================================= # REMOVE APP MAIN DIR #================================================= @@ -73,6 +65,14 @@ ynh_script_progression --message="Removing NGINX web server configuration..." -- # Remove the dedicated NGINX config ynh_remove_nginx_config +#================================================= +# REMOVE DEPENDENCIES +#================================================= +ynh_script_progression --message="Removing dependencies..." --weight=2 + +# Remove metapackage and its dependencies +ynh_remove_app_dependencies + #================================================= # SPECIFIC REMOVE #================================================= diff --git a/scripts/restore b/scripts/restore index 1196324..8f48d70 100755 --- a/scripts/restore +++ b/scripts/restore @@ -15,7 +15,6 @@ source /usr/share/yunohost/helpers #================================================= ynh_clean_setup () { - #### Remove this function if there's nothing to clean before calling the remove script. true } # Exit if an error occurs during the execution of the script diff --git a/scripts/upgrade b/scripts/upgrade index f455546..71bf0f2 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -27,6 +27,7 @@ detect_and_read_radarr_and_sonarr_settings #================================================= # CHECK VERSION #================================================= +ynh_script_progression --message="Checking version..." upgrade_type=$(ynh_check_app_version_changed) @@ -53,12 +54,6 @@ ynh_script_progression --message="Stopping a systemd service..." --weight=1 ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log" -#================================================= -# ENSURE DOWNWARD COMPATIBILITY -#================================================= -#ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 - - #================================================= # CREATE DEDICATED USER #================================================= From 72d05c2b00fa7e674590b0743defd0cfb28afafe Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 30 Jan 2022 03:13:44 +0100 Subject: [PATCH 3/3] Fix step order Fix: Failed to start bazarr.service: Unit bazarr.service not found. --- conf/systemd.service | 2 ++ scripts/install | 16 ++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/conf/systemd.service b/conf/systemd.service index 4071d0f..d339abb 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -14,6 +14,8 @@ StandardOutput=append:/var/log/__APP__/__APP__.log StandardError=inherit # Sandboxing options to harden security +# Depending on specificities of your service/app, you may need to tweak these +# .. but this should be a good baseline # Details for these options: https://www.freedesktop.org/software/systemd/man/systemd.exec.html NoNewPrivileges=yes PrivateTmp=yes diff --git a/scripts/install b/scripts/install index d922745..fa11a1b 100755 --- a/scripts/install +++ b/scripts/install @@ -116,6 +116,14 @@ pushd $final_path ynh_exec_as $app $final_path/venv/bin/pip install -r "$final_path/requirements.txt" popd +#================================================= +# SETUP SYSTEMD +#================================================= +ynh_script_progression --message="Configuring a systemd service..." --weight=1 + +# Create a dedicated systemd config +ynh_add_systemd_config + #================================================= # ADD A CONFIGURATION #================================================= @@ -139,14 +147,6 @@ ynh_add_config --template="config.ini" --destination="$final_path/data/config/co chmod 660 "$final_path/data/config/config.ini" chown $app: "$final_path/data/config/config.ini" -#================================================= -# SETUP SYSTEMD -#================================================= -ynh_script_progression --message="Configuring a systemd service..." --weight=1 - -# Create a dedicated systemd config -ynh_add_systemd_config - #================================================= # YUNOHOST MULTIMEDIA INTEGRATION #=================================================