diff --git a/check_process b/check_process index 13a646a..f19ea2e 100644 --- a/check_process +++ b/check_process @@ -2,8 +2,6 @@ auto_remove=1 ; Manifest domain="domain.tld" (DOMAIN) - server_login_password="super_secret_password" (PASSWORD) - password="super_secret_password" welcometext="Welcome to my mumble server" registername="Root" ; Checks diff --git a/manifest.json b/manifest.json index e075202..a4adaba 100644 --- a/manifest.json +++ b/manifest.json @@ -29,24 +29,6 @@ }, "example": "domain.org" }, - { - "name": "server_login_password", - "type": "password", - "ask": { - "en": "Choose a password for your mumble server. This password is given to persons who want to join", - "fr": "Choisissez un mot de passe pour votre serveur Mumble. Ce mot de passe sera donné aux personnes qui veulent rejoindre le serveur" - }, - "example": "super_secret_password" - }, - { - "name": "password", - "type": "password", - "ask": { - "en": "Choose a password for the SuperUser. This is different from the server password and allows you to create the first admin.", - "fr": "Choisissez un mot de passe pour le SuperUser. Il est différent du mot de passe du serveur et permet de créer le premier Administrateur." - }, - "example": "super_secret_password" - }, { "name": "welcometext", "ask": { diff --git a/scripts/install b/scripts/install index 15c25b0..b9d0d28 100644 --- a/scripts/install +++ b/scripts/install @@ -25,11 +25,12 @@ ynh_abort_if_errors # Retrieve arguments domain=$YNH_APP_ARG_DOMAIN app=$YNH_APP_INSTANCE_NAME -server_password=$YNH_APP_ARG_SERVER_LOGIN_PASSWORD -su_passwd=$YNH_APP_ARG_PASSWORD welcometext=$YNH_APP_ARG_WELCOMETEXT registerName=$YNH_APP_ARG_REGISTERNAME +server_password=$(ynh_string_random) +su_passwd=$(ynh_string_random) + #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS #================================================= @@ -37,17 +38,12 @@ registerName=$YNH_APP_ARG_REGISTERNAME final_path=/var/www/$app test ! -e "$final_path" || ynh_die "This path already contains a folder" -# Check if su_password is not empty -if [[ -z "$su_passwd" ]]; then - ynh_die "Password is not set" -fi - #================================================= # STORE SETTINGS FROM MANIFEST #================================================= # Save app settings -ynh_app_setting_set "$app" domain "$domain" +ynh_app_setting_set "$app" domain "$domain" ynh_app_setting_set "$app" server_password "$server_password" ynh_app_setting_set "$app" su_passwd "$su_passwd" ynh_app_setting_set "$app" welcometext "$welcometext"