Add config panel for mail address and mail name
This commit is contained in:
@@ -0,0 +1,9 @@
|
||||
# we need to clear invoiceninja's cache after updating vars
|
||||
# through the config-panel.
|
||||
ynh_app_config_apply() {
|
||||
_ynh_app_config_apply
|
||||
pushd "$install_dir"
|
||||
# Optimize the framework for better performance
|
||||
php$phpversion artisan optimize --no-interaction --verbose
|
||||
popd
|
||||
}
|
||||
+5
-3
@@ -14,12 +14,14 @@ api_secret="$(ynh_string_random --length=32)"
|
||||
app_key="$(ynh_string_random --length=32)"
|
||||
phantomjs_key="$(ynh_string_random --length=32)"
|
||||
|
||||
email_fullname="$(ynh_user_get_info --username=$admin --key=fullname)"
|
||||
email="$(ynh_user_get_info --username=$admin --key=mail)"
|
||||
mail_address=$(ynh_app_setting_get --app=$mail_address --key=mail_address)
|
||||
mail_name=$(ynh_app_setting_get --app=$mail_name --key=mail_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"
|
||||
|
||||
#=================================================
|
||||
# DOWNLOAD, CHECK AND UNPACK SOURCE
|
||||
@@ -55,7 +57,7 @@ ynh_script_progression "Building the application..."
|
||||
pushd "$install_dir"
|
||||
# Run the database migrations and initially fill the db
|
||||
php$php_version artisan migrate:fresh --seed --no-interaction --verbose --force
|
||||
php$php_version artisan ninja:create-account --email $email --password "$password" --no-interaction --verbose
|
||||
php$php_version artisan ninja:create-account --email $mail_address --password "$password" --no-interaction --verbose
|
||||
php$php_version artisan optimize --no-interaction --verbose
|
||||
php$php_version artisan view:clear
|
||||
php$php_version artisan cache:clear
|
||||
|
||||
+21
-2
@@ -11,14 +11,33 @@ source /usr/share/yunohost/helpers
|
||||
#=================================================
|
||||
ynh_script_progression "Ensuring downward compatibility..."
|
||||
|
||||
if [ -z "${mail_address:-}" ]; then
|
||||
mail_address="true"
|
||||
ynh_app_setting_set --app=$app --key=mail_address --value=$mail_address
|
||||
fi
|
||||
|
||||
if [ -z "${mail_name:-}" ]; then
|
||||
mail_name="true"
|
||||
ynh_app_setting_set --app=$app --key=mail_name --value=$mail_name
|
||||
fi
|
||||
|
||||
# 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_lastname
|
||||
ynh_app_setting_delete --key=email # also delete unnecessary duplicate of state storage
|
||||
|
||||
# Retrieve `$admin` user settings
|
||||
ynh_app_setting_set_default --key=email_fullname --value="$(ynh_user_get_info --username=$admin --key=fullname)"
|
||||
ynh_app_setting_set_default --key=email --value="$(ynh_user_get_info --username=$admin --key=mail)"
|
||||
mail_from_name=$(ynh_app_setting_get --key=mail_from_name)
|
||||
if [ -z "$mail_from_name" ]; then
|
||||
mail_from_name="${app}@${domain}"
|
||||
ynh_app_setting_set --key=mail_from_name --value="$mail_from_name"
|
||||
fi
|
||||
|
||||
mail_from_sender=$(ynh_app_setting_get --key=mail_from_sender)
|
||||
if [ -z "$mail_from_sender" ]; then
|
||||
mail_from_sender="${app}@${domain}"
|
||||
ynh_app_setting_set --key=mail_from_sender --value="$mail_from_sender"
|
||||
fi
|
||||
|
||||
ynh_app_setting_set_default --key=api_secret --value="$(ynh_string_random --length=32)"
|
||||
ynh_app_setting_set_default --key=app_key --value="$(ynh_string_random --length=32)"
|
||||
|
||||
Reference in New Issue
Block a user