Remove question from manifest
This commit is contained in:
@@ -53,18 +53,6 @@ ram.runtime = "50M"
|
|||||||
[install.password]
|
[install.password]
|
||||||
type = "password"
|
type = "password"
|
||||||
|
|
||||||
[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"
|
|
||||||
example = "Invoice Ninja"
|
|
||||||
|
|
||||||
[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"
|
|
||||||
example = "invoiceninja@example.com"
|
|
||||||
|
|
||||||
[resources]
|
[resources]
|
||||||
|
|
||||||
[resources.sources]
|
[resources.sources]
|
||||||
|
|||||||
+4
-4
@@ -14,14 +14,14 @@ api_secret="$(ynh_string_random --length=32)"
|
|||||||
app_key="$(ynh_string_random --length=32)"
|
app_key="$(ynh_string_random --length=32)"
|
||||||
phantomjs_key="$(ynh_string_random --length=32)"
|
phantomjs_key="$(ynh_string_random --length=32)"
|
||||||
|
|
||||||
mail_address=$(ynh_app_setting_get --key=default_from_email_address)
|
email_fullname="$(ynh_user_get_info --username=$admin --key=fullname)"
|
||||||
mail_name=$(ynh_app_setting_get --key=default_from_email_name)
|
email="$(ynh_user_get_info --username=$admin --key=mail)"
|
||||||
|
|
||||||
ynh_app_setting_set --key=api_secret --value=$api_secret
|
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=app_key --value=$app_key
|
||||||
ynh_app_setting_set --key=phantomjs_key --value=$phantomjs_key
|
ynh_app_setting_set --key=phantomjs_key --value=$phantomjs_key
|
||||||
ynh_app_setting_set --key=default_from_email_address --value="$mail_address"
|
ynh_app_setting_set --key=default_from_email_address --value="$email"
|
||||||
ynh_app_setting_set --key=default_from_email_name --value="$mail_name"
|
ynh_app_setting_set --key=default_from_email_name --value="$email_fullname"
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# DOWNLOAD, CHECK AND UNPACK SOURCE
|
# DOWNLOAD, CHECK AND UNPACK SOURCE
|
||||||
|
|||||||
+4
-14
@@ -11,32 +11,22 @@ source /usr/share/yunohost/helpers
|
|||||||
#=================================================
|
#=================================================
|
||||||
ynh_script_progression "Ensuring downward compatibility..."
|
ynh_script_progression "Ensuring downward compatibility..."
|
||||||
|
|
||||||
if [ -z "${mail_address:-}" ]; then
|
|
||||||
mail_address="${app}@${domain}"
|
|
||||||
ynh_app_setting_set --key=default_from_email_address --value=$mail_address
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "${mail_name:-}" ]; then
|
|
||||||
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
|
# Delete deprecated `firstname`/`lastname` settings. See upstream https://github.com/YunoHost/yunohost/pull/1516
|
||||||
ynh_app_setting_delete --key=email_firstname
|
ynh_app_setting_delete --key=email_firstname
|
||||||
ynh_app_setting_delete --key=email_lastname
|
ynh_app_setting_delete --key=email_lastname
|
||||||
ynh_app_setting_delete --key=email # also delete unnecessary duplicate of state storage
|
ynh_app_setting_delete --key=email # also delete unnecessary duplicate of state storage
|
||||||
|
|
||||||
# Retrieve `$admin` user settings
|
# Retrieve `$admin` user settings
|
||||||
mail_from_name=$(ynh_app_setting_get --key=mail_from_name)
|
mail_from_name=$(ynh_app_setting_get --key=default_from_email_address)
|
||||||
if [ -z "$mail_from_name" ]; then
|
if [ -z "$mail_from_name" ]; then
|
||||||
mail_from_name="${app}@${domain}"
|
mail_from_name="${app}@${domain}"
|
||||||
ynh_app_setting_set --key=mail_from_name --value="$mail_from_name"
|
ynh_app_setting_set --key=default_from_email_address --value="$mail_from_name"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mail_from_sender=$(ynh_app_setting_get --key=mail_from_sender)
|
mail_from_sender=$(ynh_app_setting_get --key=default_from_email_name)
|
||||||
if [ -z "$mail_from_sender" ]; then
|
if [ -z "$mail_from_sender" ]; then
|
||||||
mail_from_sender="${app}@${domain}"
|
mail_from_sender="${app}@${domain}"
|
||||||
ynh_app_setting_set --key=mail_from_sender --value="$mail_from_sender"
|
ynh_app_setting_set --key=default_from_email_name --value="$mail_from_sender"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
ynh_app_setting_set_default --key=api_secret --value="$(ynh_string_random --length=32)"
|
ynh_app_setting_set_default --key=api_secret --value="$(ynh_string_random --length=32)"
|
||||||
|
|||||||
Reference in New Issue
Block a user