Merge pull request '12b' (#1) from 12b into master

Reviewed-on: #1
This commit is contained in:
Douze Bé 2022-10-09 15:08:07 +00:00
commit f7bba30313
3 changed files with 14 additions and 4 deletions

View File

@ -1,5 +1,6 @@
metadata_dir = "/opt/yunohost/__APP__/metadata" metadata_dir = "/opt/yunohost/__APP__/metadata"
data_dir = "__DATADIR__" data_dir = "__DATADIR__"
virtualization = "__VIRTUALIZATION__"
block_size = 1048576 block_size = 1048576
block_manager_background_tranquility = 2 block_manager_background_tranquility = 2

View File

@ -6,7 +6,7 @@
"en": "S3 storage", "en": "S3 storage",
"fr": "stockage S3" "fr": "stockage S3"
}, },
"version": "0.7.3~ynh1", "version": "0.7.3~ynh2",
"url": "https://garagehq.deuxfleurs.fr/", "url": "https://garagehq.deuxfleurs.fr/",
"upstream": { "upstream": {
"license": "free", "license": "free",
@ -69,6 +69,16 @@
"fr": "dossier de stockage des données" "fr": "dossier de stockage des données"
} }
} }
{
"name": "virtualization",
"type": "boolean",
"default": "true",
"exemple": "false",
"ask" : {
"en" : "use virtual disk to constrain data size",
"fr": "utiliser un disque virtuel pour limiter la taille des données"
}
}
] ]
} }
} }

View File

@ -33,6 +33,7 @@ rpc_secret=$YNH_APP_ARG_RPC_SECRET
bootstrap_peers=$YNH_APP_ARG_BOOTSTRAP_PEERS bootstrap_peers=$YNH_APP_ARG_BOOTSTRAP_PEERS
datadir=$YNH_APP_ARG_DATADIR datadir=$YNH_APP_ARG_DATADIR
weight=$YNH_APP_ARG_WEIGHT weight=$YNH_APP_ARG_WEIGHT
virtualization=$YNH_APP_ARG_VIRTUALIZATION
### If it's a multi-instance app, meaning it can be installed several times independently ### If it's a multi-instance app, meaning it can be installed several times independently
@ -95,10 +96,7 @@ ynh_script_progression --message="Checking virtualisation availability…" --tim
if [ "$(which modprobe)" = "" ] if [ "$(which modprobe)" = "" ]
then then
virtualisation=false virtualisation=false
else
virtualisation=true
fi fi
ynh_app_setting_set --app=$app --key=virtualisation --value=true
#================================================= #=================================================
# STORE SETTINGS FROM MANIFEST # STORE SETTINGS FROM MANIFEST
@ -109,6 +107,7 @@ ynh_app_setting_set --app=$app --key=domain --value=$domain
ynh_app_setting_set --app=$app --key=rpc_secret --value=$rpc_secret ynh_app_setting_set --app=$app --key=rpc_secret --value=$rpc_secret
ynh_app_setting_set --app=$app --key=datadir --value=$datadir ynh_app_setting_set --app=$app --key=datadir --value=$datadir
ynh_app_setting_set --app=$app --key=bootstrap_peers --value=$bootstrap_peers ynh_app_setting_set --app=$app --key=bootstrap_peers --value=$bootstrap_peers
ynh_app_setting_set --app=$app --key=virtualisation --value=$virtualisation
#================================================= #=================================================