From 513c9fc60b7e6b8d90465f4bd7a59f90ba500101 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 19 Sep 2021 08:24:31 +0200 Subject: [PATCH 1/6] Cleaning up --- doc/DESCRIPTION.md | 0 doc/DESCRIPTION_fr.md | 1 + manifest.json | 11 ++++------- scripts/backup | 5 ----- scripts/change_url | 23 +++++++++++------------ scripts/remove | 10 ---------- scripts/restore | 2 -- 7 files changed, 16 insertions(+), 36 deletions(-) create mode 100644 doc/DESCRIPTION.md create mode 100644 doc/DESCRIPTION_fr.md diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md new file mode 100644 index 0000000..e69de29 diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md new file mode 100644 index 0000000..38a802e --- /dev/null +++ b/doc/DESCRIPTION_fr.md @@ -0,0 +1 @@ +Sonarr est un PVR pour les utilisateurs Usenet et BitTorrent. Il peut surveiller plusieurs flux RSS pour les nouveaux épisodes de vos émissions préférées et les récupérer, les trier et les renommer. Il peut également être configuré pour mettre à niveau automatiquement la qualité des fichiers déjà téléchargés lorsqu'un format de meilleure qualité devient disponible. diff --git a/manifest.json b/manifest.json index 9c7961f..bfc0cb4 100644 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ "id": "sonarr", "packaging_format": 1, "description": { - "en": "A series collection manager for Usenet and BitTorrent users.", - "fr": "Un gestionnaire de collection de séries pour utilisateurs de Usenet et BitTorrent." + "en": "A series collection manager for Usenet and BitTorrent users", + "fr": "Gestionnaire de collection de séries pour utilisateurs de Usenet et BitTorrent" }, "version": "3.0.6.1196~ynh1", "url": "https://sonarr.tv", @@ -25,15 +25,13 @@ "multi_instance": true, "services": [ "nginx", - "php7.3-fpm", "mysql" ], "arguments": { "install" : [ { "name": "domain", - "type": "domain", - "example": "example.com" + "type": "domain" }, { "name": "path", @@ -43,8 +41,7 @@ }, { "name": "admin", - "type": "user", - "example": "johndoe" + "type": "user" } ] } diff --git a/scripts/backup b/scripts/backup index 0670178..bfc28b4 100755 --- a/scripts/backup +++ b/scripts/backup @@ -36,11 +36,6 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) #================================================= ynh_print_info --message="Declaring files to be backed up..." -### N.B. : the following 'ynh_backup' calls are only a *declaration* of what needs -### to be backuped and not an actual copy of any file. The actual backup that -### creates and fill the archive with the files happens in the core after this -### script is called. Hence ynh_backups calls takes basically 0 seconds to run. - #================================================= # BACKUP THE APP MAIN DIR #================================================= diff --git a/scripts/change_url b/scripts/change_url index cfa454f..f2e412b 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -24,7 +24,7 @@ app=$YNH_APP_INSTANCE_NAME #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --time --weight=1 +ynh_script_progression --message="Loading installation settings..." --weight=1 # Needed for helper "ynh_add_nginx_config" final_path=$(ynh_app_setting_get --app=$app --key=final_path) @@ -34,7 +34,7 @@ api_key=$(ynh_app_setting_get --app=$app --key=api_key) #================================================= # BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --time --weight=1 +ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=1 # Backup the current version of the app ynh_backup_before_upgrade @@ -69,14 +69,14 @@ fi #================================================= # STOP SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Stopping a systemd service..." --time --weight=1 +ynh_script_progression --message="Stopping a systemd service..." --weight=1 ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" #================================================= # MODIFY URL IN NGINX CONF #================================================= -ynh_script_progression --message="Updating NGINX web server configuration..." --time --weight=1 +ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1 nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf @@ -108,26 +108,25 @@ fi # UPDATE CONFIGURATION FILE #================================================= -ynh_exec_warn_less 'ynh_add_config --template="../conf/config.xml" --destination="$final_path/config.xml"' +path=$new_path -mkdir -p "$final_path" -chmod 750 "$final_path" -chmod -R o-rwx "$final_path" -chown -R $app:$app "$final_path" +ynh_exec_warn_less ynh_add_config --template="../conf/config.xml" --destination="$final_path/config.xml" + +chown $app:$app "$final_path/config.xml" #================================================= # GENERIC FINALISATION #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Starting a systemd service..." --time --weight=1 +ynh_script_progression --message="Starting a systemd service..." --weight=1 ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Starting Web Server" #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --time --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload @@ -135,4 +134,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Change of URL completed for $app" --time --last +ynh_script_progression --message="Change of URL completed for $app" --last diff --git a/scripts/remove b/scripts/remove index 745b6b6..93ff07a 100755 --- a/scripts/remove +++ b/scripts/remove @@ -73,16 +73,6 @@ ynh_script_progression --message="Removing logrotate configuration..." --weight= # Remove the app-specific logrotate config ynh_remove_logrotate -#================================================= -# CLOSE A PORT -#================================================= - -if yunohost firewall list | grep -q "\- $port$" -then - ynh_script_progression --message="Closing port $port..." --weight=1 - ynh_exec_warn_less yunohost firewall disallow TCP $port -fi - #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/restore b/scripts/restore index 87bd5cf..3d20cff 100755 --- a/scripts/restore +++ b/scripts/restore @@ -37,8 +37,6 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=1 -ynh_webpath_available --domain=$domain --path_url=$path_url \ - || ynh_die --message="Path not available: ${domain}${path_url}" test ! -d $final_path \ || ynh_die --message="There is already a directory: $final_path " From bc10a3b740cd104c45fb740ce4593bc506f89a20 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sun, 19 Sep 2021 06:24:38 +0000 Subject: [PATCH 2/6] Auto-update README --- README.md | 2 +- README_fr.md | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4510aa4..b2288a1 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -A series collection manager for Usenet and BitTorrent users. +A series collection manager for Usenet and BitTorrent users **Shipped version:** 3.0.6.1196~ynh1 diff --git a/README_fr.md b/README_fr.md index 9c640bc..11bc092 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,8 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble -Un gestionnaire de collection de séries pour utilisateurs de Usenet et BitTorrent. +Sonarr est un PVR pour les utilisateurs Usenet et BitTorrent. Il peut surveiller plusieurs flux RSS pour les nouveaux épisodes de vos émissions préférées et les récupérer, les trier et les renommer. Il peut également être configuré pour mettre à niveau automatiquement la qualité des fichiers déjà téléchargés lorsqu'un format de meilleure qualité devient disponible. + **Version incluse :** 3.0.6.1196~ynh1 From 56e0e8944ab078cc026720d8b4b4f1d49ee7327e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 19 Sep 2021 08:41:48 +0200 Subject: [PATCH 3/6] Update DESCRIPTION.md --- doc/DESCRIPTION.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index e69de29..5faee6a 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -0,0 +1 @@ +Sonarr is a PVR for Usenet and BitTorrent users. It can monitor multiple RSS feeds for new episodes of your favorite shows and will grab, sort and rename them. It can also be configured to automatically upgrade the quality of files already downloaded when a better quality format becomes available. From 5557dff17197cf6ad0475e90f144c4f16fa16a66 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sun, 19 Sep 2021 06:41:57 +0000 Subject: [PATCH 4/6] Auto-update README --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b2288a1..89b6af5 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,8 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -A series collection manager for Usenet and BitTorrent users +Sonarr is a PVR for Usenet and BitTorrent users. It can monitor multiple RSS feeds for new episodes of your favorite shows and will grab, sort and rename them. It can also be configured to automatically upgrade the quality of files already downloaded when a better quality format becomes available. + **Shipped version:** 3.0.6.1196~ynh1 From 68716fc609e9b8624d634eea4cdeabaff67e2980 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sun, 19 Sep 2021 10:33:06 +0200 Subject: [PATCH 5/6] Bump package version --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index bfc0cb4..a136725 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "A series collection manager for Usenet and BitTorrent users", "fr": "Gestionnaire de collection de séries pour utilisateurs de Usenet et BitTorrent" }, - "version": "3.0.6.1196~ynh1", + "version": "3.0.6.1196~ynh2", "url": "https://sonarr.tv", "upstream": { "license": "GPL-3.0-only", From 09f79a053c85656f8b674360ef9674de3caa487c Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sun, 19 Sep 2021 08:33:08 +0000 Subject: [PATCH 6/6] 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 89b6af5..94580d7 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Sonarr is a PVR for Usenet and BitTorrent users. It can monitor multiple RSS feeds for new episodes of your favorite shows and will grab, sort and rename them. It can also be configured to automatically upgrade the quality of files already downloaded when a better quality format becomes available. -**Shipped version:** 3.0.6.1196~ynh1 +**Shipped version:** 3.0.6.1196~ynh2 diff --git a/README_fr.md b/README_fr.md index 11bc092..ded7be5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -14,7 +14,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Sonarr est un PVR pour les utilisateurs Usenet et BitTorrent. Il peut surveiller plusieurs flux RSS pour les nouveaux épisodes de vos émissions préférées et les récupérer, les trier et les renommer. Il peut également être configuré pour mettre à niveau automatiquement la qualité des fichiers déjà téléchargés lorsqu'un format de meilleure qualité devient disponible. -**Version incluse :** 3.0.6.1196~ynh1 +**Version incluse :** 3.0.6.1196~ynh2