1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/mobilizon_ynh.git synced 2024-09-03 19:46:19 +02:00

Tweak manifest question to simplify / be more consistent

This commit is contained in:
Alexandre Aubin 2020-10-26 17:42:03 +01:00
parent 9293ad5dff
commit b76947f8aa
3 changed files with 11 additions and 24 deletions

View file

@ -30,15 +30,6 @@
},
"example": "example.com"
},
{
"name": "admin",
"type": "user",
"ask": {
"en": "Choose an admin user",
"fr": "Choisissez l'administrateur"
},
"example": "johndoe"
},
{
"name": "is_public",
"type": "boolean",
@ -58,6 +49,15 @@
"choices": ["fr", "en"],
"default": "fr"
},
{
"name": "admin",
"type": "user",
"ask": {
"en": "Choose an admin user",
"fr": "Choisissez l'administrateur"
},
"example": "johndoe"
},
{
"name": "password",
"type": "password",
@ -66,17 +66,7 @@
"fr": "Définissez le mot de passe administrateur"
},
"example": "Choose a password"
},
{
"name": "name",
"type": "string",
"ask": {
"en": "Choose the instance name",
"fr": "Choisissez le nom de l'instance"
},
"example": "Mobilizon",
"default": "Mobilizon"
}
}
]
}
}

View file

@ -30,7 +30,6 @@ is_public=$YNH_APP_ARG_IS_PUBLIC
language=$YNH_APP_ARG_LANGUAGE
password=$YNH_APP_ARG_PASSWORD
name=$YNH_APP_ARG_NAME
admin_email=$(ynh_user_get_info $admin 'mail')
app=$YNH_APP_INSTANCE_NAME
@ -56,7 +55,6 @@ ynh_app_setting_set --app=$app --key=path --value=$path_url
ynh_app_setting_set --app=$app --key=admin --value=$admin
ynh_app_setting_set --app=$app --key=is_public --value=$is_public
ynh_app_setting_set --app=$app --key=language --value=$language
ynh_app_setting_set --app=$app --key=name --value=$name
ynh_app_setting_set --app=$app --key=admin_email --value=$admin_email
#=================================================
@ -154,7 +152,7 @@ pushd $final_path/$app
sudo -u "$app" MIX_ENV=prod mix local.rebar --force
sudo -u "$app" MIX_ENV=prod mix deps.get
sudo -u "$app" MIX_ENV=prod mix compile
sudo -u "$app" MIX_ENV=prod mix mobilizon.instance gen --force --output $config --output-psql /tmp/setup_db.psql --domain $domain --instance-name $name --admin-email $admin_email --dbhost localhost --dbname $db_name --dbuser $db_user --dbpass $db_pwd --listen-port $port
sudo -u "$app" MIX_ENV=prod mix mobilizon.instance gen --force --output $config --output-psql /tmp/setup_db.psql --domain $domain --instance-name "Mobilizon" --admin-email $admin_email --dbhost localhost --dbname $db_name --dbuser $db_user --dbpass $db_pwd --listen-port $port
popd
cat "../conf/ldap.exs" >> "$config"

View file

@ -28,7 +28,6 @@ db_user=$db_name
db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd)
port=$(ynh_app_setting_get --app=$app --key=port)
secret=$(ynh_app_setting_get --app=$app --key=secret)
name=$(ynh_app_setting_get --app=$app --key=name)
admin_email=$(ynh_app_setting_get --app=$app --key=admin_email)
#=================================================