Use example values instead of default during install, var renmaing

config_panel.toml

@@ -5,13 +5,13 @@ name = "InvoicNinja configuration"
     [main.config]
     name = "Configuration Options"
 
-        [main.config.mail_address]
+        [main.config.default_from_email_address]
         ask.en = "Choose from which mail address emails will be sent"
         ask.fr = "Choisissez à partir de quelle adresse e-mail les e-mails seront envoyés"
         help = "Default email address to use for various automated emails."
         bind = "MAIL_FROM_ADDRESS:__INSTALL_DIR__/.env"
 
-        [main.config.mail_name]
+        [main.config.default_from_email_name]
         ask.en = "Choose what name will be displayed when InvoiceNinja sends mails"
         ask.fr = "Choisissez quel nom sera affiché lorsque InvoiceNinja enverra des e-mails"
         help = "Default name address to use for various automated names."

manifest.toml

@@ -53,17 +53,17 @@ ram.runtime = "50M"
     [install.password]
     type = "password"
 
-    [install.mail_name]
+    [install.default_from_email_name]
     ask.en = "Choose what name will be displayed when InvoiceNinja sends mails"
     ask.fr = "Choisissez quel nom sera affiché lorsque InvoiceNinja enverra des e-mails"
     type = "string"
-    default = "Invoice Ninja"
+    example = "Invoice Ninja"
 
-    [install.mail_address]
+    [install.default_from_email_address]
     ask.en = "Choose from which mail address emails will be sent"
     ask.fr = "Choisissez à partir de quelle adresse e-mail les e-mails seront envoyés"
     type = "email"
-    default = ""
+    example = "invoiceninja@example.com"
 
 [resources]
 

scripts/install

@@ -14,14 +14,14 @@ api_secret="$(ynh_string_random --length=32)"
 app_key="$(ynh_string_random --length=32)"
 phantomjs_key="$(ynh_string_random --length=32)"
 
-mail_address=$(ynh_app_setting_get --key=mail_address)
-mail_name=$(ynh_app_setting_get --key=mail_name)
+mail_address=$(ynh_app_setting_get --key=default_from_email_address)
+mail_name=$(ynh_app_setting_get --key=default_from_email_name)
 
 ynh_app_setting_set --key=api_secret --value=$api_secret
 ynh_app_setting_set --key=app_key --value=$app_key
 ynh_app_setting_set --key=phantomjs_key --value=$phantomjs_key
-ynh_app_setting_set --key=mail_address --value="$mail_address"
-ynh_app_setting_set --key=mail_name --value="$mail_name"
+ynh_app_setting_set --key=default_from_email_address --value="$mail_address"
+ynh_app_setting_set --key=default_from_email_name --value="$mail_name"
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE

scripts/upgrade

@@ -12,13 +12,13 @@ source /usr/share/yunohost/helpers
 ynh_script_progression "Ensuring downward compatibility..."
 
 if [ -z "${mail_address:-}" ]; then
-	mail_address="true"
-	ynh_app_setting_set --key=mail_address --value=$mail_address
+	mail_address="${app}@${domain}"
+	ynh_app_setting_set --key=default_from_email_address --value=$mail_address
 fi
 
 if [ -z "${mail_name:-}" ]; then
-	mail_name="true"
-	ynh_app_setting_set --key=mail_name --value=$mail_name
+	mail_name="${app}@${domain}"
+	ynh_app_setting_set --key=default_from_email_name --value=$mail_name
 fi
 
 # Delete deprecated `firstname`/`lastname` settings. See upstream https://github.com/YunoHost/yunohost/pull/1516

tests.toml

@@ -12,8 +12,8 @@ test_format = 1.0
     # Default args to use for install
     # -------------------------------
 
-    args.mail_address = "invoiceninja@domain.tld"
-    args.mail_name = "invoiceninja"
+    args.default_from_email_address = "invoiceninja@example.tld"
+    args.default_from_email_name = "invoiceninja"
 
     # -------------------------------
     # Commits to test upgrade from