mirror of
https://github.com/YunoHost-Apps/mytinytodo_ynh.git
synced 2024-09-03 19:46:01 +02:00
Fix
This commit is contained in:
Éric Gaspar
parent
8f71915787
commit
cba98173fa
4 changed files with 2 additions and 70 deletions
|
|
@ -42,24 +42,6 @@
|
|||
"example": "/mytinytodo",
|
||||
"default": "/mytinytodo"
|
||||
},
|
||||
{
|
||||
"name": "title",
|
||||
"type": "string",
|
||||
"ask": {
|
||||
"en": "Choose a title for your todo list",
|
||||
"fr": "Choisissez le titre pour votre liste de tâches"
|
||||
},
|
||||
"default": "myTinyTodo"
|
||||
},
|
||||
{
|
||||
"name": "set_password",
|
||||
"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."
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "is_public",
|
||||
"type": "boolean",
|
||||
|
|
@ -68,27 +50,6 @@
|
|||
"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
|
||||
},
|
||||
{
|
||||
"name": "language",
|
||||
"type": "string",
|
||||
"ask": {
|
||||
"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"
|
||||
],
|
||||
"default": "fr"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,15 +23,9 @@ ynh_abort_if_errors
|
|||
domain=$YNH_APP_ARG_DOMAIN
|
||||
path_url=$YNH_APP_ARG_PATH
|
||||
is_public=$YNH_APP_ARG_IS_PUBLIC
|
||||
language=$YNH_APP_ARG_LANGUAGE
|
||||
timezone="$(cat /etc/timezone)"
|
||||
phpversion=$YNH_PHP_VERSION
|
||||
title=$YNH_APP_ARG_TITLE
|
||||
|
||||
app=$YNH_APP_INSTANCE_NAME
|
||||
|
||||
set_password="$YNH_APP_ARG_SET_PASSWORD"
|
||||
|
||||
#=================================================
|
||||
# CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
|
||||
#=================================================
|
||||
|
|
@ -50,9 +44,6 @@ ynh_script_progression --message="Storing installation settings..." --weight=1
|
|||
|
||||
ynh_app_setting_set --app=$app --key=domain --value=$domain
|
||||
ynh_app_setting_set --app=$app --key=path --value=$path_url
|
||||
ynh_app_setting_set --app=$app --key=language --value=$language
|
||||
ynh_app_setting_set --app=$app --key=set_password --value="$set_password"
|
||||
ynh_app_setting_set --app=$app --key=title --value=$title
|
||||
|
||||
#=================================================
|
||||
# INSTALL DEPENDENCIES
|
||||
|
|
@ -71,7 +62,7 @@ db_user=$db_name
|
|||
ynh_app_setting_set --app=$app --key=db_name --value=$db_name
|
||||
ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name
|
||||
|
||||
# Charge les commandes sql communes à tous les scripts.
|
||||
# Charge les commandes SQL communes à tous les scripts.
|
||||
ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ../conf/sql/mytinytodo.sql
|
||||
|
||||
#=================================================
|
||||
|
|
@ -102,6 +93,7 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=2
|
|||
|
||||
# Create a dedicated PHP-FPM config
|
||||
ynh_add_fpm_config
|
||||
phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
|
||||
|
||||
#=================================================
|
||||
# NGINX CONFIGURATION
|
||||
|
|
|
|||
|
|
@ -18,16 +18,11 @@ app=$YNH_APP_INSTANCE_NAME
|
|||
|
||||
domain=$(ynh_app_setting_get --app=$app --key=domain)
|
||||
path_url=$(ynh_app_setting_get --app=$app --key=path)
|
||||
language=$(ynh_app_setting_get --app=$app --key=language)
|
||||
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_app_setting_get --app=$app --key=phpversion)
|
||||
timezone="$(cat /etc/timezone)"
|
||||
|
||||
set_password=$(ynh_app_setting_get --app=$app --key=set_password)
|
||||
title=$(ynh_app_setting_get --app=$app --key=title)
|
||||
|
||||
#=================================================
|
||||
# CHECK VERSION
|
||||
|
|
@ -54,22 +49,6 @@ ynh_abort_if_errors
|
|||
#=================================================
|
||||
ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
|
||||
|
||||
if [ -z "$set_password" ]; then
|
||||
set_password=""
|
||||
ynh_app_setting_set --app=$app --key=set_password --value=$set_password
|
||||
fi
|
||||
|
||||
if [ -z "$title" ]; then
|
||||
title="MytinyTodo"
|
||||
ynh_app_setting_set --app=$app --key=title --value=$title
|
||||
fi
|
||||
|
||||
# If fpm_footprint doesn't exist, create it
|
||||
if [ -z "$timezone" ]; then
|
||||
timezone="$(cat /etc/timezone)"
|
||||
ynh_app_setting_set --app=$app --key=timezone --value=$timezone
|
||||
fi
|
||||
|
||||
# Cleaning legacy permissions
|
||||
if ynh_legacy_permissions_exists; then
|
||||
ynh_legacy_permissions_delete_all
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue