From b76947f8aa8c59a7a20a3c91cb2b93faf9e39f19 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 26 Oct 2020 17:42:03 +0100 Subject: [PATCH] Tweak manifest question to simplify / be more consistent --- manifest.json | 30 ++++++++++-------------------- scripts/install | 4 +--- scripts/upgrade | 1 - 3 files changed, 11 insertions(+), 24 deletions(-) diff --git a/manifest.json b/manifest.json index 19fcdec..08f7b46 100644 --- a/manifest.json +++ b/manifest.json @@ -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" - } + } ] } } diff --git a/scripts/install b/scripts/install index 15c071a..bdd81a3 100644 --- a/scripts/install +++ b/scripts/install @@ -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" diff --git a/scripts/upgrade b/scripts/upgrade index bc5413d..ca8a5bc 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -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) #=================================================