mirror of
https://github.com/YunoHost-Apps/mytinytodo_ynh.git
synced 2024-09-03 19:46:01 +02:00
Testing (#37)
* 1.6.8 (#25) * 1.6.8 * Update updater.sh * Config panel (#30) * Update manifest.json * Auto-update README * Update config_panel.toml * 1.6.10 (#33) * 1.6.10 * Auto-update README Co-authored-by: yunohost-bot <yunohost@yunohost.org> * Auto-update README * [autopatch] Add Common Platform Enumeration id to `manifest.json` (#35) Co-authored-by: Yunohost-Bot <> * set relative path for --keep opt (#36) * Update manifest.json * Auto-update README * Fix scripts order Co-authored-by: yunohost-bot <yunohost@yunohost.org> Co-authored-by: YunoHost Bot <yunohost-bot@users.noreply.github.com>
This commit is contained in:
Éric Gaspar
GitHub
parent
184134f563
commit
7efb78e2db
6 changed files with 81 additions and 74 deletions
22
README.md
22
README.md
|
|
@ -5,7 +5,7 @@ It shall NOT be edited by hand.
|
|||
|
||||
# myTinyTodo for YunoHost
|
||||
|
||||
[](https://dash.yunohost.org/appci/app/mytinytodo)  
|
||||
[](https://dash.yunohost.org/appci/app/mytinytodo)  
|
||||
[](https://install-app.yunohost.org/?app=mytinytodo)
|
||||
|
||||
*[Lire ce readme en français.](./README_fr.md)*
|
||||
|
|
@ -31,31 +31,33 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
|
|||
- tyle for mobiles devices
|
||||
|
||||
|
||||
**Shipped version:** 1.6.10~ynh1
|
||||
**Shipped version:** 1.6.10~ynh2
|
||||
|
||||
|
||||
**Demo:** https://www.mytinytodo.net/demo/
|
||||
|
||||
## Screenshots
|
||||
|
||||
|
||||
|
||||
|
||||
## Documentation and resources
|
||||
|
||||
* Official app website: http://www.mytinytodo.net/
|
||||
* Official admin documentation: https://www.mytinytodo.net/faq.php
|
||||
* Upstream app code repository: https://github.com/maxpozdeev/mytinytodo
|
||||
* YunoHost documentation for this app: https://yunohost.org/app_mytinytodo
|
||||
* Report a bug: https://github.com/YunoHost-Apps/mytinytodo_ynh/issues
|
||||
* Official app website: <http://www.mytinytodo.net/>
|
||||
* Official admin documentation: <https://www.mytinytodo.net/faq.php>
|
||||
* Upstream app code repository: <https://github.com/maxpozdeev/mytinytodo>
|
||||
* YunoHost documentation for this app: <https://yunohost.org/app_mytinytodo>
|
||||
* Report a bug: <https://github.com/YunoHost-Apps/mytinytodo_ynh/issues>
|
||||
|
||||
## Developer info
|
||||
|
||||
Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/mytinytodo_ynh/tree/testing).
|
||||
|
||||
To try the testing branch, please proceed like that.
|
||||
```
|
||||
|
||||
``` bash
|
||||
sudo yunohost app install https://github.com/YunoHost-Apps/mytinytodo_ynh/tree/testing --debug
|
||||
or
|
||||
sudo yunohost app upgrade mytinytodo -u https://github.com/YunoHost-Apps/mytinytodo_ynh/tree/testing --debug
|
||||
```
|
||||
|
||||
**More info regarding app packaging:** https://yunohost.org/packaging_apps
|
||||
**More info regarding app packaging:** <https://yunohost.org/packaging_apps>
|
||||
|
|
|
|||
28
README_fr.md
28
README_fr.md
|
|
@ -1,10 +1,14 @@
|
|||
<!--
|
||||
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.
|
||||
-->
|
||||
|
||||
# myTinyTodo pour YunoHost
|
||||
|
||||
[](https://dash.yunohost.org/appci/app/mytinytodo)  
|
||||
[](https://dash.yunohost.org/appci/app/mytinytodo)  
|
||||
[](https://install-app.yunohost.org/?app=mytinytodo)
|
||||
|
||||
*[Read this readme in english.](./README.md)*
|
||||
*[Lire ce readme en français.](./README_fr.md)*
|
||||
|
||||
> *Ce package vous permet d'installer myTinyTodo 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.*
|
||||
|
|
@ -27,31 +31,33 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
|
|||
- tyle for mobiles devices
|
||||
|
||||
|
||||
**Version incluse :** 1.6.10~ynh1
|
||||
**Version incluse :** 1.6.10~ynh2
|
||||
|
||||
|
||||
**Démo :** https://www.mytinytodo.net/demo/
|
||||
|
||||
## Captures d'écran
|
||||
|
||||
|
||||
|
||||
|
||||
## Documentations et ressources
|
||||
|
||||
* Site officiel de l'app : http://www.mytinytodo.net/
|
||||
* Documentation officielle de l'admin : https://www.mytinytodo.net/faq.php
|
||||
* Dépôt de code officiel de l'app : https://github.com/maxpozdeev/mytinytodo
|
||||
* Documentation YunoHost pour cette app : https://yunohost.org/app_mytinytodo
|
||||
* Signaler un bug : https://github.com/YunoHost-Apps/mytinytodo_ynh/issues
|
||||
* Site officiel de l'app : <http://www.mytinytodo.net/>
|
||||
* Documentation officielle de l'admin : <https://www.mytinytodo.net/faq.php>
|
||||
* Dépôt de code officiel de l'app : <https://github.com/maxpozdeev/mytinytodo>
|
||||
* Documentation YunoHost pour cette app : <https://yunohost.org/app_mytinytodo>
|
||||
* Signaler un bug : <https://github.com/YunoHost-Apps/mytinytodo_ynh/issues>
|
||||
|
||||
## Informations pour les développeurs
|
||||
|
||||
Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/mytinytodo_ynh/tree/testing).
|
||||
|
||||
Pour essayer la branche testing, procédez comme suit.
|
||||
```
|
||||
|
||||
``` bash
|
||||
sudo yunohost app install https://github.com/YunoHost-Apps/mytinytodo_ynh/tree/testing --debug
|
||||
ou
|
||||
sudo yunohost app upgrade mytinytodo -u https://github.com/YunoHost-Apps/mytinytodo_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>
|
||||
|
|
|
|||
|
|
@ -6,14 +6,15 @@
|
|||
"en": "Open source to-do list script",
|
||||
"fr": "Gestionnaire de todo list"
|
||||
},
|
||||
"version": "1.6.10~ynh1",
|
||||
"version": "1.6.10~ynh2",
|
||||
"url": "http://www.mytinytodo.net/",
|
||||
"upstream": {
|
||||
"license": "GPL-2.0",
|
||||
"website": "http://www.mytinytodo.net/",
|
||||
"demo": "https://www.mytinytodo.net/demo/",
|
||||
"admindoc": "https://www.mytinytodo.net/faq.php",
|
||||
"code": "https://github.com/maxpozdeev/mytinytodo"
|
||||
"code": "https://github.com/maxpozdeev/mytinytodo",
|
||||
"cpe": "cpe:2.3:a:mytinytodo:mytinytodo"
|
||||
},
|
||||
"license": "GPL-2.0",
|
||||
"maintainer": {
|
||||
|
|
@ -21,7 +22,7 @@
|
|||
"email": "pierre.levasseur@free.fr"
|
||||
},
|
||||
"requirements": {
|
||||
"yunohost": ">= 4.3.0"
|
||||
"yunohost": ">= 11.0.9"
|
||||
},
|
||||
"multi_instance": false,
|
||||
"services": [
|
||||
|
|
@ -30,7 +31,7 @@
|
|||
"mysql"
|
||||
],
|
||||
"arguments": {
|
||||
"install" : [
|
||||
"install": [
|
||||
{
|
||||
"name": "domain",
|
||||
"type": "domain"
|
||||
|
|
@ -45,8 +46,8 @@
|
|||
"name": "title",
|
||||
"type": "string",
|
||||
"ask": {
|
||||
"en": "Choose a title for your todo list",
|
||||
"fr": "Choisissez le titre pour votre liste de tâches"
|
||||
"en": "Choose a title for your todo list",
|
||||
"fr": "Choisissez le titre pour votre liste de tâches"
|
||||
},
|
||||
"default": "myTinyTodo"
|
||||
},
|
||||
|
|
@ -55,8 +56,8 @@
|
|||
"type": "password",
|
||||
"optional": true,
|
||||
"ask": {
|
||||
"en": "Specify password here to protect your tasks from modification, or leave empty that everyone could read/write todolist",
|
||||
"fr": "Spécifiez le mot de passe ici pour protéger vos tâches, ou laissez vide pour que tout le monde puisse lire/écrire votre liste de tâche."
|
||||
"en": "Specify password here to protect your tasks from modification, or leave empty that everyone could read/write todolist",
|
||||
"fr": "Spécifiez le mot de passe ici pour protéger vos tâches, ou laissez vide pour que tout le monde puisse lire/écrire votre liste de tâche."
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -66,18 +67,29 @@
|
|||
"en": "If enabled, myTinyTodo will be accessible by people who do not have an account. This can be changed later via the webadmin.",
|
||||
"fr": "Si cette case est cochée, myTinyTodo sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin."
|
||||
},
|
||||
"default": true
|
||||
"default": true
|
||||
},
|
||||
{
|
||||
"name": "language",
|
||||
"type": "string",
|
||||
"ask": {
|
||||
"en": "Choose the application language",
|
||||
"fr": "Choisissez la langue de l'application"
|
||||
"en": "Choose the application language",
|
||||
"fr": "Choisissez la langue de l'application"
|
||||
},
|
||||
"choices": ["ar", "de", "en", "fr", "it", "nl", "pt-pt", "ru", "uk", "zh-cn"],
|
||||
"choices": [
|
||||
"ar",
|
||||
"de",
|
||||
"en",
|
||||
"fr",
|
||||
"it",
|
||||
"nl",
|
||||
"pt-pt",
|
||||
"ru",
|
||||
"uk",
|
||||
"zh-cn"
|
||||
],
|
||||
"default": "fr"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -95,14 +95,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..." --weight=2
|
||||
|
||||
# Create a dedicated NGINX config
|
||||
ynh_add_nginx_config
|
||||
|
||||
#=================================================
|
||||
# PHP-FPM CONFIGURATION
|
||||
#=================================================
|
||||
|
|
@ -111,6 +103,14 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=2
|
|||
# Create a dedicated PHP-FPM config
|
||||
ynh_add_fpm_config
|
||||
|
||||
#=================================================
|
||||
# NGINX CONFIGURATION
|
||||
#=================================================
|
||||
ynh_script_progression --message="Configuring NGINX web server..." --weight=2
|
||||
|
||||
# Create a dedicated NGINX config
|
||||
ynh_add_nginx_config
|
||||
|
||||
#=================================================
|
||||
# MODIFY A CONFIG FILE
|
||||
#=================================================
|
||||
|
|
|
|||
|
|
@ -28,23 +28,18 @@ path_url=$(ynh_app_setting_get --app=$app --key=path)
|
|||
final_path=$(ynh_app_setting_get --app=$app --key=final_path)
|
||||
db_name=$(ynh_app_setting_get --app=$app --key=db_name)
|
||||
db_user=$db_name
|
||||
phpversion=$YNH_PHP_VERSION
|
||||
phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
|
||||
|
||||
#=================================================
|
||||
# CHECK IF THE APP CAN BE RESTORED
|
||||
#=================================================
|
||||
ynh_script_progression --message="Validating restoration parameters..." --weight=2
|
||||
|
||||
test ! -d $final_path || ynh_die --message="There is already a directory: $final_path "
|
||||
test ! -d $final_path \
|
||||
|| ynh_die --message="There is already a directory: $final_path "
|
||||
|
||||
#=================================================
|
||||
# STANDARD RESTORATION STEPS
|
||||
#=================================================
|
||||
# RESTORE THE NGINX CONFIGURATION
|
||||
#=================================================
|
||||
|
||||
ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
|
||||
|
||||
#=================================================
|
||||
# RECREATE THE DEDICATED USER
|
||||
#=================================================
|
||||
|
|
@ -63,11 +58,6 @@ ynh_restore_file --origin_path="$final_path"
|
|||
chmod 750 "$final_path"
|
||||
chmod -R o-rwx "$final_path"
|
||||
chown -R $app:www-data "$final_path"
|
||||
|
||||
#=================================================
|
||||
# RESTORE USER RIGHTS
|
||||
#=================================================
|
||||
|
||||
chmod 775 $final_path/db/config.php
|
||||
chmod 775 $final_path/tmp/sessions
|
||||
|
||||
|
|
@ -86,8 +76,12 @@ ynh_script_progression --message="Reconfiguring PHP-FPM..." --weight=2
|
|||
|
||||
ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
|
||||
|
||||
# Recreate a dedicated php-fpm config
|
||||
ynh_add_fpm_config
|
||||
#=================================================
|
||||
# RESTORE THE NGINX CONFIGURATION
|
||||
#=================================================
|
||||
ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1
|
||||
|
||||
ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
|
||||
|
||||
#=================================================
|
||||
# RESTORE THE MYSQL DATABASE
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
|
|||
db_name=$(ynh_app_setting_get --app=$app --key=db_name)
|
||||
db_user=$db_name
|
||||
db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
|
||||
phpversion=$YNH_PHP_VERSION
|
||||
phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
|
||||
timezone="$(cat /etc/timezone)"
|
||||
|
||||
set_password=$(ynh_app_setting_get --app=$app --key=set_password)
|
||||
|
|
@ -93,29 +93,14 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
|
|||
then
|
||||
ynh_script_progression --message="Upgrading source files..." --weight=2
|
||||
|
||||
# Remove the app directory securely
|
||||
ynh_secure_remove --file="$final_path"
|
||||
|
||||
# Download, check integrity, uncompress and patch the source from app.src
|
||||
ynh_setup_source --dest_dir="$final_path" #--keep="$final_path/db/config.php"
|
||||
|
||||
# Remove the tmp directory securely
|
||||
#nh_secure_remove --file="$tmpdir"
|
||||
ynh_exec_warn_less ynh_add_config --template="../conf/config.php" --destination="$final_path/db/config.php"
|
||||
ynh_setup_source --dest_dir="$final_path" --keep="db/config.php"
|
||||
fi
|
||||
|
||||
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..." --weight=1
|
||||
|
||||
# Create a dedicated NGINX config
|
||||
ynh_add_nginx_config
|
||||
|
||||
#=================================================
|
||||
# UPGRADE DEPENDENCIES
|
||||
#=================================================
|
||||
|
|
@ -131,6 +116,14 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2
|
|||
# Create a dedicated PHP-FPM config
|
||||
ynh_add_fpm_config
|
||||
|
||||
#=================================================
|
||||
# NGINX CONFIGURATION
|
||||
#=================================================
|
||||
ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
|
||||
|
||||
# Create a dedicated NGINX config
|
||||
ynh_add_nginx_config
|
||||
|
||||
#=================================================
|
||||
# RESTORE USER RIGHTS
|
||||
#=================================================
|
||||
|
|
|
|||
Loading…
Reference in a new issue