From c5abf15d87b17e9289ac521902c4c5c1b890cfbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Sun, 28 Jan 2024 17:25:21 +0100 Subject: [PATCH 1/2] Cleanup --- README.md | 2 +- README_fr.md | 2 +- conf/install-conf.yml | 2 +- manifest.toml | 2 +- scripts/backup | 8 +------- 5 files changed, 5 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index b067987..4c9336e 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ File sharing platform ## Documentation and resources * Official app website: -* Official admin documentation: +* Official admin documentation: * Upstream app code repository: * YunoHost Store: * Report a bug: diff --git a/README_fr.md b/README_fr.md index bb77681..84fcf4d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ Plateforme de partage de fichiers ## Documentations et ressources * Site officiel de l’app : -* Documentation officielle de l’admin : +* Documentation officielle de l’admin : * Dépôt de code officiel de l’app : * YunoHost Store: * Signaler un bug : diff --git a/conf/install-conf.yml b/conf/install-conf.yml index 76f0403..8c030ab 100644 --- a/conf/install-conf.yml +++ b/conf/install-conf.yml @@ -19,4 +19,4 @@ dbtcpname: __DB_NAME__ dbtcpuser: __DB_USER__ dbtcppassword: __DB_PWD__ -dsfolder: __DATA_DIR__ \ No newline at end of file +dsfolder: __DATA_DIR__ diff --git a/manifest.toml b/manifest.toml index 19a0390..60b77de 100644 --- a/manifest.toml +++ b/manifest.toml @@ -14,7 +14,7 @@ maintainers = ["julienmalik"] [upstream] license = "AGPL-3.0-or-later" website = "https://pydio.com" -admindoc = "https://pydio.com/en/docs/" +admindoc = "https://pydio.com/en/docs" code = "https://github.com/pydio/cells" cpe = "cpe:2.3:a:pydio:cells" fund = "https://pydio.com/en/pricing" diff --git a/scripts/backup b/scripts/backup index 6c13dbb..ea3891d 100644 --- a/scripts/backup +++ b/scripts/backup @@ -28,17 +28,11 @@ ynh_backup --src_path="$install_dir" ynh_backup --src_path="$data_dir" --is_big #================================================= -# BACKUP THE NGINX CONFIGURATION +# SYSTEM CONFIGURATION #================================================= ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# SPECIFIC BACKUP -#================================================= -# BACKUP SYSTEMD -#================================================= - ynh_backup --src_path="/etc/systemd/system/$app.service" #================================================= From 9e64ef64d474aa6215a0c278e878c22b28bb0d62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Sun, 28 Jan 2024 17:29:31 +0100 Subject: [PATCH 2/2] Add missing --weight --- scripts/install | 8 ++++---- scripts/remove | 2 +- scripts/restore | 6 +++--- scripts/upgrade | 10 +++++----- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/scripts/install b/scripts/install index e919f6c..45f15f9 100644 --- a/scripts/install +++ b/scripts/install @@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -ynh_script_progression --message="Setting up source files..." +ynh_script_progression --message="Setting up source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" @@ -26,7 +26,7 @@ chown -R "$app:www-data" "$install_dir" #================================================= # ADD A CONFIGURATION #================================================= -ynh_script_progression --message="Adding a configuration file..." +ynh_script_progression --message="Adding a configuration file..." --weight=1 ynh_add_config --template="../conf/install-conf.yml" --destination="$install_dir/install-conf.yml" ynh_delete_file_checksum --file="$install_dir/install-conf.yml" @@ -51,7 +51,7 @@ yunohost service add "$app" --description="File sharing platform" #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Starting a systemd service..." +ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service ynh_systemd_action --service_name="$app" --action="start" --log_path="systemd" --line_match="Restart done" @@ -60,4 +60,4 @@ ynh_systemd_action --service_name="$app" --action="start" --log_path="systemd" - # END OF SCRIPT #================================================= -ynh_script_progression --message="Installation of $app completed" +ynh_script_progression --message="Installation of $app completed" --last diff --git a/scripts/remove b/scripts/remove index 969710b..e2a26db 100644 --- a/scripts/remove +++ b/scripts/remove @@ -36,4 +36,4 @@ ynh_remove_nginx_config # END OF SCRIPT #================================================= -ynh_script_progression --message="Removal of $app completed" +ynh_script_progression --message="Removal of $app completed" --last diff --git a/scripts/restore b/scripts/restore index b2ca40e..1eeae3e 100644 --- a/scripts/restore +++ b/scripts/restore @@ -13,7 +13,7 @@ source /usr/share/yunohost/helpers #================================================= # RESTORE THE APP MAIN DIR #================================================= -ynh_script_progression --message="Restoring the app main directory..." +ynh_script_progression --message="Restoring the app main directory..." --weight=1 ynh_restore_file --origin_path="$install_dir" @@ -22,7 +22,7 @@ chown -R $app:www-data "$install_dir" #================================================= # RESTORE THE DATA DIRECTORY #================================================= -ynh_script_progression --message="Restoring the data directory..." +ynh_script_progression --message="Restoring the data directory..." --weight=1 ynh_restore_file --origin_path="$data_dir" --not_mandatory @@ -63,4 +63,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Restoration completed for $app" +ynh_script_progression --message="Restoration completed for $app" --last diff --git a/scripts/upgrade b/scripts/upgrade index 4150871..a71c2ee 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -14,19 +14,19 @@ source /usr/share/yunohost/helpers #================================================= # STOP SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Stopping a systemd service..." +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..." +ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -ynh_script_progression --message="Upgrading source files..." +ynh_script_progression --message="Upgrading source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep=".config .minio" @@ -52,7 +52,7 @@ yunohost service add "$app" #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Starting a systemd service..." +ynh_script_progression --message="Starting a systemd service..." --weight=1 ynh_systemd_action --service_name="$app" --action="start" --log_path="systemd" --line_match="Restart done" @@ -60,4 +60,4 @@ ynh_systemd_action --service_name="$app" --action="start" --log_path="systemd" - # END OF SCRIPT #================================================= -ynh_script_progression --message="Upgrade of $app completed" +ynh_script_progression --message="Upgrade of $app completed" --last