YunoHost-Apps/lxd-dashboard_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/lxd-dashboard_ynh.git synced 2024-09-03 19:36:18 +02:00
Code Issues Activity Actions

Merge pull request #10 from YunoHost-Apps/upgrade

Browse source 
Fix #9
This commit is contained in:
yalh76 2022-06-19 02:17:50 +02:00 committed by GitHub
commit 40222fcfd4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 82 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
README.md
View file

@ -5,7 +5,7 @@ It shall NOT be edited by hand.
# LXD Dashboard for YunoHost # 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) [![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)* *[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 ## Overview
Makes it easy for you to take control of your LXD based infrastructure Web-based user interface capable of managing multiple LXD servers from a single location.
**Shipped version:** 3.4.0~ynh1
**Shipped version:** 3.4.0~ynh2
## Screenshots ## 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 ## Documentation and resources
* Official app website: https://lxdware.com * Official app website: <https://lxdware.com>
* Upstream app code repository: https://github.com/lxdware/lxd-dashboard * Upstream app code repository: <https://github.com/lxdware/lxd-dashboard>
* YunoHost documentation for this app: https://yunohost.org/app_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 * Report a bug: <https://github.com/YunoHost-Apps/lxd-dashboard_ynh/issues>
## Developer info ## Developer info
Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/lxd-dashboard_ynh/tree/testing). 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. 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 sudo yunohost app install https://github.com/YunoHost-Apps/lxd-dashboard_ynh/tree/testing --debug
or or
sudo yunohost app upgrade lxd-dashboard -u https://github.com/YunoHost-Apps/lxd-dashboard_ynh/tree/testing --debug 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 **More info regarding app packaging:** <https://yunohost.org/packaging_apps>

33
README_fr.md
View file

@ -1,42 +1,51 @@
<!--
N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
It shall NOT be edited by hand.
-->
# LXD Dashboard pour YunoHost # 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) [![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)* *[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. > *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.* Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
## Vue d'ensemble ## 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 ## 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 ## Documentations et ressources
* Site officiel de l'app : https://lxdware.com * Site officiel de l'app : <https://lxdware.com>
* Dépôt de code officiel de l'app : https://github.com/lxdware/lxd-dashboard * 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 * Documentation YunoHost pour cette app : <https://yunohost.org/app_lxd-dashboard>
* Signaler un bug : https://github.com/YunoHost-Apps/lxd-dashboard_ynh/issues * Signaler un bug : <https://github.com/YunoHost-Apps/lxd-dashboard_ynh/issues>
## Informations pour les développeurs ## 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). 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. 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 sudo yunohost app install https://github.com/YunoHost-Apps/lxd-dashboard_ynh/tree/testing --debug
ou ou
sudo yunohost app upgrade lxd-dashboard -u https://github.com/YunoHost-Apps/lxd-dashboard_ynh/tree/testing --debug 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 **Plus d'infos sur le packaging d'applications :** <https://yunohost.org/packaging_apps>

10
check_process
View file

@ -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 ;; Test complet
; Manifest ; Manifest
domain="domain.tld" domain="domain.tld"
path="/path" path="/path"
admin="john"
is_public=1 is_public=1
admin="john"
password="1Strong-Password" password="1Strong-Password"
; Checks ; Checks
pkg_linter=1 pkg_linter=1
@ -18,7 +13,8 @@
setup_private=1 setup_private=1
setup_public=1 setup_public=1
upgrade=1 upgrade=1
#upgrade=1 from_commit=CommitHash # 3.4.0~ynh1
upgrade=1 from_commit=ed116405de78fe380bb9abf309b47d5c4f6fa005
backup_restore=1 backup_restore=1
multi_instance=1 multi_instance=1
port_already_use=0 port_already_use=0

1
doc/DESCRIPTION.md
View file

@ -0,0 +1 @@
Web-based user interface capable of managing multiple LXD servers from a single location.

2
doc/DISCLAIMER.md
View file

@ -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

10
manifest.json
View file

@ -5,7 +5,7 @@
"description": { "description": {
"en": "Makes it easy for you to take control of your LXD based infrastructure" "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", "url": "https://lxdware.com",
"upstream": { "upstream": {
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
@ -37,15 +37,15 @@
"example": "/lxd-dashboard", "example": "/lxd-dashboard",
"default": "/lxd-dashboard" "default": "/lxd-dashboard"
}, },
{
"name": "admin",
"type": "user"
},
{ {
"name": "is_public", "name": "is_public",
"type": "boolean", "type": "boolean",
"default": true "default": true
}, },
{
"name": "admin",
"type": "user"
},
{ {
"name": "password", "name": "password",
"type": "password" "type": "password"

23
scripts/install
View file

@ -25,10 +25,9 @@ ynh_abort_if_errors
domain=$YNH_APP_ARG_DOMAIN domain=$YNH_APP_ARG_DOMAIN
path_url=$YNH_APP_ARG_PATH path_url=$YNH_APP_ARG_PATH
admin=$YNH_APP_ARG_ADMIN
is_public=$YNH_APP_ARG_IS_PUBLIC is_public=$YNH_APP_ARG_IS_PUBLIC
admin=$YNH_APP_ARG_ADMIN
password=$YNH_APP_ARG_PASSWORD password=$YNH_APP_ARG_PASSWORD
admin_mail=$(ynh_user_get_info --username=$admin --key=mail)
app=$YNH_APP_INSTANCE_NAME app=$YNH_APP_INSTANCE_NAME
@ -92,14 +91,6 @@ chmod 750 "$final_path"
chmod -R o-rwx "$final_path" chmod -R o-rwx "$final_path"
chown -R $app:www-data "$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 # PHP-FPM CONFIGURATION
#================================================= #=================================================
@ -108,6 +99,14 @@ ynh_script_progression --message="Configuring PHP-FPM..."
# Create a dedicated PHP-FPM config # Create a dedicated PHP-FPM config
ynh_add_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 # SPECIFIC SETUP
#================================================= #=================================================
@ -137,9 +136,9 @@ ynh_permission_update --permission="main" --add="visitors"
# Installation with curl # Installation with curl
ynh_script_progression --message="Finalizing installation..." 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/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 # Remove the public access
ynh_permission_update --permission="main" --remove="visitors" ynh_permission_update --permission="main" --remove="visitors"

2
scripts/remove
View file

@ -43,8 +43,8 @@ ynh_secure_remove --file="$final_path"
#================================================= #=================================================
# REMOVE DATA DIR # REMOVE DATA DIR
#================================================= #=================================================
ynh_script_progression --message="Removing app data directory..." ynh_script_progression --message="Removing app data directory..."
ynh_secure_remove --file="$datadir/data" ynh_secure_remove --file="$datadir/data"
ynh_secure_remove --file="$datadir/backups" ynh_secure_remove --file="$datadir/backups"

28
scripts/restore
View file

@ -45,13 +45,6 @@ test ! -d $final_path \
#================================================= #=================================================
# STANDARD RESTORATION STEPS # 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 # RECREATE THE DEDICATED USER
#================================================= #=================================================
@ -84,13 +77,6 @@ chmod 750 "$datadir"
chmod -R o-rwx "$datadir" chmod -R o-rwx "$datadir"
chown -R $app:www-data "$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 # SPECIFIC RESTORATION
#================================================= #=================================================
@ -101,6 +87,20 @@ ynh_script_progression --message="Reinstalling dependencies..."
# Define and install dependencies # Define and install dependencies
ynh_install_app_dependencies $pkg_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 # RESTORE THE MYSQL DATABASE
#================================================= #=================================================

16
scripts/upgrade
View file

@ -85,14 +85,6 @@ chmod 750 "$final_path"
chmod -R o-rwx "$final_path" chmod -R o-rwx "$final_path"
chown -R $app:www-data "$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 # UPGRADE DEPENDENCIES
#================================================= #=================================================
@ -108,6 +100,14 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..."
# Create a dedicated PHP-FPM config # Create a dedicated PHP-FPM config
ynh_add_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 # SPECIFIC UPGRADE
#================================================= #=================================================