diff --git a/README.md b/README.md index 38846e2..4e888d2 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ -# Universal Media Server (UMS) YunoHost +# Universal Media Server (ums) YunoHost **WORK IN PROGRESS: This app does not work yet and does not install or remove properly : Use with caution!!** -[![Integration level](https://dash.yunohost.org/integration/UMS.svg)](https://dash.yunohost.org/appci/app/UMS) ![](https://ci-apps.yunohost.org/ci/badges/UMS.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/UMS.maintain.svg) -[![Install UMS with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=UMS) +[![Integration level](https://dash.yunohost.org/integration/ums.svg)](https://dash.yunohost.org/appci/app/ums) ![](https://ci-apps.yunohost.org/ci/badges/ums.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/ums.maintain.svg) +[![Install ums with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=ums) *[Lire ce readme en français.](./README_fr.md)* -> *This package allows you to install UMS quickly and simply on a YunoHost server. +> *This package allows you to install ums quickly and simply on a YunoHost server. If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* ## Overview @@ -42,8 +42,8 @@ Can the app be used by multiple users? #### Supported architectures **Only x_86_64 has been tested so far** -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/UMS.svg)](https://ci-apps.yunohost.org/ci/apps/UMS/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/UMS.svg)](https://ci-apps-arm.yunohost.org/ci/apps/UMS/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/ums.svg)](https://ci-apps.yunohost.org/ci/apps/ums/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/ums.svg)](https://ci-apps-arm.yunohost.org/ci/apps/ums/) ## Limitations @@ -60,7 +60,7 @@ https://yunohost.org/packaging_apps ## Links - * Report a bug: https://github.com/YunoHost-Apps/UMS_ynh/issues + * Report a bug: https://github.com/YunoHost-Apps/ums_ynh/issues * App website: Link to the official website of this app. * Upstream app repository: Link to the official repository of the upstream app. * YunoHost website: https://yunohost.org/ @@ -70,11 +70,11 @@ https://yunohost.org/packaging_apps ## Developer info **Only if you want to use a testing branch for coding, instead of merging directly into master.** -Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/UMS_ynh/tree/testing). +Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/ums_ynh/tree/testing). To try the testing branch, please proceed like that. ``` -sudo yunohost app install https://github.com/YunoHost-Apps/UMS_ynh/tree/testing --debug +sudo yunohost app install https://github.com/YunoHost-Apps/ums_ynh/tree/testing --debug or -sudo yunohost app upgrade UMS -u https://github.com/YunoHost-Apps/UMS_ynh/tree/testing --debug +sudo yunohost app upgrade ums -u https://github.com/YunoHost-Apps/ums_ynh/tree/testing --debug ``` diff --git a/README_fr.md b/README_fr.md index 90de1cd..a8240ce 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,13 +1,13 @@ -# Universal Media Server (UMS) pour YunoHost +# Universal Media Server (ums) pour YunoHost **WORK IN PROGRESS : Le package n'est pas stable ni fonctionnel actuellement, aucune garantie de fonctionnement, d'installation sans souci ni d'ailleurs de désinstallation sans soucis** -[![Niveau d'intégration](https://dash.yunohost.org/integration/UMS.svg)](https://dash.yunohost.org/appci/app/UMS) ![](https://ci-apps.yunohost.org/ci/badges/UMS.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/UMS.maintain.svg) -[![Installer UMS avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=UMS) +[![Niveau d'intégration](https://dash.yunohost.org/integration/ums.svg)](https://dash.yunohost.org/appci/app/ums) ![](https://ci-apps.yunohost.org/ci/badges/ums.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/ums.maintain.svg) +[![Installer ums avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=ums) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer UMS rapidement et simplement sur un serveur YunoHost. +> *Ce package vous permet d'installer ums rapidement et simplement sur un serveur YunoHost. Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour apprendre comment l'installer.* ## Vue d'ensemble @@ -43,8 +43,8 @@ Comment configurer cette application : via le panneau d'administration, un fichi **Développement en cours sur x86_64. Aucun tests effectués encore sur d'autres architectures** -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/UMS.svg)](https://ci-apps.yunohost.org/ci/apps/UMS/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/UMS.svg)](https://ci-apps-arm.yunohost.org/ci/apps/UMS/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/ums.svg)](https://ci-apps.yunohost.org/ci/apps/ums/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/ums.svg)](https://ci-apps-arm.yunohost.org/ci/apps/ums/) ## Limitations @@ -64,7 +64,7 @@ https://yunohost.org/packaging_apps ## Liens - * Signaler un bug : https://github.com/YunoHost-Apps/UMS_ynh/issues + * Signaler un bug : https://github.com/YunoHost-Apps/ums_ynh/issues * Site de l'application : Lien vers le site officiel de cette application. * Dépôt de l'application principale : Lien vers le dépôt officiel de l'application principale. * Site web YunoHost : https://yunohost.org/ @@ -74,11 +74,11 @@ https://yunohost.org/packaging_apps ## Informations pour les développeurs **Seulement si vous voulez utiliser une branche de test pour le codage, au lieu de fusionner directement dans la banche principale.** -Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/UMS_ynh/tree/testing). +Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/ums_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. ``` -sudo yunohost app install https://github.com/YunoHost-Apps/UMS_ynh/tree/testing --debug +sudo yunohost app install https://github.com/YunoHost-Apps/ums_ynh/tree/testing --debug ou -sudo yunohost app upgrade UMS -u https://github.com/YunoHost-Apps/UMS_ynh/tree/testing --debug +sudo yunohost app upgrade ums -u https://github.com/YunoHost-Apps/ums_ynh/tree/testing --debug ``` diff --git a/check_process b/check_process index 09d74b4..208ef62 100644 --- a/check_process +++ b/check_process @@ -9,8 +9,8 @@ setup_sub_dir=0 setup_root=1 setup_nourl=0 - setup_private=0 - setup_public=0 + setup_private=1 + setup_public=1 upgrade=1 # upgrade=0 from_commit=CommitHash backup_restore=1 diff --git a/issue_template.md b/issue_template.md index 4a290c4..f10131e 100644 --- a/issue_template.md +++ b/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 REPLACEBYYOURAPP itself. Refer to its documentation or repository for help.* + - *Otherwise, the issue may be due to ums 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 REPLACEBYYOURAPP + sudo yunohost app install ums ``` - *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/scripts/install b/scripts/install index 1e98afc..9b4fab1 100755 --- a/scripts/install +++ b/scripts/install @@ -182,7 +182,7 @@ yunohost service add $app --description="A DLNA, UPnP and HTTP(S) Media Server." #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Starting a systemd service... --weight=1 +ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" diff --git a/scripts/restore b/scripts/restore index 918b9b8..614371c 100755 --- a/scripts/restore +++ b/scripts/restore @@ -24,7 +24,7 @@ ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --time --weight=1 +ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME @@ -42,7 +42,7 @@ fi #================================================= # CHECK IF THE APP CAN BE RESTORED #================================================= -ynh_script_progression --message="Validating restoration parameters..." --time --weight=1 +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}" @@ -60,14 +60,14 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # RESTORE THE APP MAIN DIR #================================================= -ynh_script_progression --message="Restoring the app main directory..." --time --weight=1 +ynh_script_progression --message="Restoring the app main directory..." --weight=5 ynh_restore_file --origin_path="$final_path" #================================================= # RECREATE THE DEDICATED USER #================================================= -ynh_script_progression --message="Recreating the dedicated system user..." --time --weight=1 +ynh_script_progression --message="Recreating the dedicated system user..." --weight=3 # Create the dedicated user (if not existing) #UMS require a home path for the user as config files are stored in there @@ -105,7 +105,7 @@ chown root:$app "$final_path/UMS.sh" #================================================= # REINSTALL DEPENDENCIES #================================================= -ynh_script_progression --message="Reinstalling dependencies..." --time --weight=1 +ynh_script_progression --message="Reinstalling dependencies..." --weight=15 # Define and install dependencies ynh_install_app_dependencies $pkg_dependencies @@ -113,7 +113,7 @@ ynh_install_app_dependencies $pkg_dependencies #================================================= # RESTORE SYSTEMD #================================================= -ynh_script_progression --message="Restoring the systemd configuration..." --time --weight=1 +ynh_script_progression --message="Restoring the systemd configuration..." --weight=1 ynh_restore_file --origin_path="/etc/systemd/system/$app.service" systemctl enable $app.service --quiet @@ -121,14 +121,14 @@ systemctl enable $app.service --quiet #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= -ynh_script_progression --message="Integrating service in YunoHost..." --time --weight=1 +ynh_script_progression --message="Integrating service in YunoHost..." --weight=2 yunohost service add $app --description=A DLNA, UPnP and HTTP(S) Media Server. --log=/var/log/$app/$app.log --needs_exposed_ports $port_web $port_rend #================================================= # 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="/var/log/$app/$app.log" @@ -151,7 +151,7 @@ ynh_restore_file --origin_path="/etc/logrotate.d/$app" #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..." --time --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload @@ -159,4 +159,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Restoration completed for $app" --time --last +ynh_script_progression --message="Restoration completed for $app" --last diff --git a/scripts/upgrade b/scripts/upgrade index d2474f9..3b12dd9 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --time --weight=1 +ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME @@ -173,7 +173,7 @@ ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$ap #================================================= # UPGRADE FAIL2BAN #================================================= -#ynh_script_progression --message="Reconfiguring Fail2Ban..." --time --weight=1 +#ynh_script_progression --message="Reconfiguring Fail2Ban..." --weight=1 # Create a dedicated Fail2Ban config #ynh_add_fail2ban_config --logpath="/var/log/nginx/${domain}-error.log" --failregex="Regex to match into the log for a failed login"