diff --git a/README.md b/README.md index 785c8be..f649a9e 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # LXD Dashboard for YunoHost -[![Integration level](https://dash.yunohost.org/integration/lxd-dashboard.svg)](https://dash.yunohost.org/appci/app/lxd-dashboard) ![](https://ci-apps.yunohost.org/ci/badges/lxd-dashboard.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/lxd-dashboard.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/lxd-dashboard.svg)](https://dash.yunohost.org/appci/app/lxd-dashboard) ![Working status](https://ci-apps.yunohost.org/ci/badges/lxd-dashboard.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/lxd-dashboard.maintain.svg) [![Install LXD Dashboard with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=lxd-dashboard) *[Lire ce readme en français.](./README_fr.md)* @@ -15,32 +15,37 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -Makes it easy for you to take control of your LXD based infrastructure - -**Shipped version:** 3.4.0~ynh1 +Web-based user interface capable of managing multiple LXD servers from a single location. +**Shipped version:** 3.4.0~ynh2 ## Screenshots -![](./doc/screenshots/screenshot01.png) +![Screenshot of LXD Dashboard](./doc/screenshots/screenshot01.png) + +## Disclaimers / important information + +* Important: + * Since version 3.4.0~ynh2, after a bad authentication that don't let you login, just refresh the page ## Documentation and resources -* Official app website: https://lxdware.com -* Upstream app code repository: https://github.com/lxdware/lxd-dashboard -* YunoHost documentation for this app: https://yunohost.org/app_lxd-dashboard -* Report a bug: https://github.com/YunoHost-Apps/lxd-dashboard_ynh/issues +* Official app website: +* Upstream app code repository: +* YunoHost documentation for this app: +* Report a bug: ## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/lxd-dashboard_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/lxd-dashboard_ynh/tree/testing --debug or sudo yunohost app upgrade lxd-dashboard -u https://github.com/YunoHost-Apps/lxd-dashboard_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index b452784..48ae2c0 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,42 +1,51 @@ + + # LXD Dashboard pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/lxd-dashboard.svg)](https://dash.yunohost.org/appci/app/lxd-dashboard) ![](https://ci-apps.yunohost.org/ci/badges/lxd-dashboard.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/lxd-dashboard.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/lxd-dashboard.svg)](https://dash.yunohost.org/appci/app/lxd-dashboard) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/lxd-dashboard.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/lxd-dashboard.maintain.svg) [![Installer LXD Dashboard avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=lxd-dashboard) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer LXD Dashboard rapidement et simplement sur un serveur YunoHost. Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* ## Vue d'ensemble +Web-based user interface capable of managing multiple LXD servers from a single location. -**Version incluse :** 3.4.0~ynh1 - - +**Version incluse :** 3.4.0~ynh2 ## Captures d'écran -![](./doc/screenshots/screenshot01.png) +![Capture d'écran de LXD Dashboard](./doc/screenshots/screenshot01.png) + +## Avertissements / informations importantes + +* Important: + * Since version 3.4.0~ynh2, after a bad authentication that don't let you login, just refresh the page ## Documentations et ressources -* Site officiel de l'app : https://lxdware.com -* Dépôt de code officiel de l'app : https://github.com/lxdware/lxd-dashboard -* Documentation YunoHost pour cette app : https://yunohost.org/app_lxd-dashboard -* Signaler un bug : https://github.com/YunoHost-Apps/lxd-dashboard_ynh/issues +* Site officiel de l'app : +* Dépôt de code officiel de l'app : +* Documentation YunoHost pour cette app : +* Signaler un bug : ## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/lxd-dashboard_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/lxd-dashboard_ynh/tree/testing --debug ou sudo yunohost app upgrade lxd-dashboard -u https://github.com/YunoHost-Apps/lxd-dashboard_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file +**Plus d'infos sur le packaging d'applications :** diff --git a/check_process b/check_process index 1419bb5..ffa1db5 100644 --- a/check_process +++ b/check_process @@ -1,14 +1,9 @@ -# 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 ; Manifest domain="domain.tld" path="/path" - admin="john" is_public=1 + admin="john" password="1Strong-Password" ; Checks pkg_linter=1 @@ -18,7 +13,8 @@ setup_private=1 setup_public=1 upgrade=1 - #upgrade=1 from_commit=CommitHash + # 3.4.0~ynh1 + upgrade=1 from_commit=ed116405de78fe380bb9abf309b47d5c4f6fa005 backup_restore=1 multi_instance=1 port_already_use=0 diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index e69de29..25c47b3 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -0,0 +1 @@ +Web-based user interface capable of managing multiple LXD servers from a single location. diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index e69de29..905405d 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -0,0 +1,2 @@ +* Important: + * Since version 3.4.0~ynh2, after a bad authentication that don't let you login, just refresh the page diff --git a/manifest.json b/manifest.json index 2240789..abb7b44 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Makes it easy for you to take control of your LXD based infrastructure" }, - "version": "3.4.0~ynh1", + "version": "3.4.0~ynh2", "url": "https://lxdware.com", "upstream": { "license": "AGPL-3.0-or-later", @@ -37,15 +37,15 @@ "example": "/lxd-dashboard", "default": "/lxd-dashboard" }, - { - "name": "admin", - "type": "user" - }, { "name": "is_public", "type": "boolean", "default": true }, + { + "name": "admin", + "type": "user" + }, { "name": "password", "type": "password" diff --git a/scripts/install b/scripts/install index d926caf..0fa8dfa 100755 --- a/scripts/install +++ b/scripts/install @@ -25,10 +25,9 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH -admin=$YNH_APP_ARG_ADMIN is_public=$YNH_APP_ARG_IS_PUBLIC +admin=$YNH_APP_ARG_ADMIN password=$YNH_APP_ARG_PASSWORD -admin_mail=$(ynh_user_get_info --username=$admin --key=mail) app=$YNH_APP_INSTANCE_NAME @@ -92,14 +91,6 @@ chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring NGINX web server..." - -# Create a dedicated NGINX config -ynh_add_nginx_config - #================================================= # PHP-FPM CONFIGURATION #================================================= @@ -108,6 +99,14 @@ ynh_script_progression --message="Configuring PHP-FPM..." # Create a dedicated PHP-FPM config ynh_add_fpm_config +#================================================= +# NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Configuring NGINX web server..." + +# Create a dedicated NGINX config +ynh_add_nginx_config + #================================================= # SPECIFIC SETUP #================================================= @@ -137,9 +136,9 @@ ynh_permission_update --permission="main" --add="visitors" # Installation with curl ynh_script_progression --message="Finalizing installation..." - ynh_local_curl "/backend/config/login.php?database_type=mysql&database_host=localhost&database_name=$db_name&database_user=$db_user&action=writeDatabaseConfig" "database_password=$db_pwd" -ynh_local_curl "./backend/admin/settings.php?action=createUser" "username=$admin" "password=$password" "email=$admin_mail" +ynh_local_curl "/backend/admin/settings.php?action=createUser" "username=$admin" "password=$password" +ynh_local_curl "/backend/admin/settings.php?action=createUser" "email=$(ynh_user_get_info --username=$admin --key=mail)" "first_name=$(ynh_user_get_info --username=$admin --key=firstname)" "last_name=$(ynh_user_get_info --username=$admin --key=lastname)" "password=$password" "username=$admin" # Remove the public access ynh_permission_update --permission="main" --remove="visitors" diff --git a/scripts/remove b/scripts/remove index 81bc654..9bcf770 100755 --- a/scripts/remove +++ b/scripts/remove @@ -43,8 +43,8 @@ ynh_secure_remove --file="$final_path" #================================================= # REMOVE DATA DIR #================================================= - ynh_script_progression --message="Removing app data directory..." + ynh_secure_remove --file="$datadir/data" ynh_secure_remove --file="$datadir/backups" diff --git a/scripts/restore b/scripts/restore index d61815d..e7b9e70 100755 --- a/scripts/restore +++ b/scripts/restore @@ -45,13 +45,6 @@ test ! -d $final_path \ #================================================= # STANDARD RESTORATION STEPS -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the NGINX web server configuration..." - -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" - #================================================= # RECREATE THE DEDICATED USER #================================================= @@ -84,13 +77,6 @@ chmod 750 "$datadir" chmod -R o-rwx "$datadir" chown -R $app:www-data "$datadir" -#================================================= -# RESTORE THE PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the PHP-FPM configuration..." - -ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" - #================================================= # SPECIFIC RESTORATION #================================================= @@ -101,6 +87,20 @@ ynh_script_progression --message="Reinstalling dependencies..." # Define and install dependencies ynh_install_app_dependencies $pkg_dependencies +#================================================= +# RESTORE THE PHP-FPM CONFIGURATION +#================================================= +ynh_script_progression --message="Restoring the PHP-FPM configuration..." + +ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" + +#================================================= +# RESTORE THE NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Restoring the NGINX web server configuration..." + +ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" + #================================================= # RESTORE THE MYSQL DATABASE #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 58655b0..a755fa4 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -85,14 +85,6 @@ chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." - -# Create a dedicated NGINX config -ynh_add_nginx_config - #================================================= # UPGRADE DEPENDENCIES #================================================= @@ -108,6 +100,14 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." # Create a dedicated PHP-FPM config ynh_add_fpm_config +#================================================= +# NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Upgrading NGINX web server configuration..." + +# Create a dedicated NGINX config +ynh_add_nginx_config + #================================================= # SPECIFIC UPGRADE #=================================================