diff --git a/conf/local.php b/conf/local.php index 0f2b714..1f04e1a 100644 --- a/conf/local.php +++ b/conf/local.php @@ -12,13 +12,13 @@ admin_lastname=ADMIN_LASTNAME Admin last name. admin_username=__ADMIN__ Admin username. admin_email=__EMAIL__ Admin email. admin_password=__PASSWORD__ Admin user. -mailer_from_name[=MAILER_FROM_NAME] From name for email sent from Mautic. -mailer_from_email[=MAILER_FROM_EMAIL] From email sent from Mautic. +mailer_from_name=Mautic From name for email sent from Mautic. +mailer_from_email=__APP__@__DOMAIN__ From email sent from Mautic. mailer_transport[=MAILER_TRANSPORT] Mail transport. -mailer_host=MAILER_HOST SMTP host. +mailer_host=127.0.0.1 SMTP host. mailer_port=MAILER_PORT SMTP port. -mailer_user=MAILER_USER SMTP username. -mailer_password[=MAILER_PASSWORD] SMTP password. +mailer_user=__APP__ SMTP username. +mailer_password=__MAIL_PWD__ SMTP password. mailer_encryption[=MAILER_ENCRYPTION] SMTP encryption (null|tls|ssl). mailer_auth_mode[=MAILER_AUTH_MODE] SMTP auth mode (null|plain|login|cram-md5). mailer_spool_type=MAILER_SPOOL_TYPE Spool mode (file|memory). diff --git a/manifest.toml b/manifest.toml index 6460418..429d4b7 100644 --- a/manifest.toml +++ b/manifest.toml @@ -38,12 +38,13 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/mautic/mautic/releases/download/4.4.8/4.4.8.zip" - sha256 = "e238648fb0c31e500383ac7b93e04b3a2dfcfd2335b756db36907c2ffd0a60ac" + url = "https://github.com/mautic/mautic/releases/download/5.0.0-alpha1/5.0.0-alpha1.zip" + sha256 = "7ada7244b17a0cf6b051436595cf076d85bc9ffd059364729c63f485bb9cfbae" in_subdir = false autoupdate.strategy = "latest_github_tag" [resources.system_user] + allow_email = true [resources.install_dir] @@ -51,7 +52,7 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "mariadb-server, php8.0-imap, php8.0-gmp, php8.0-curl, php8.0-intl, php8.0-mbstring, php8.0-xmlrpc, php8.0-mysql, php8.0-bcmath, php8.0-gd, php8.0-xml, php8.0-cli, php8.0-zip" + packages = "mariadb-server, php8.2-imap, php8.2-gmp, php8.2-curl, php8.2-intl, php8.2-mbstring, php8.2-xmlrpc, php8.2-mysql, php8.2-bcmath, php8.2-gd, php8.2-xml, php8.2-cli, php8.2-zip" [resources.database] type = "mysql" diff --git a/scripts/install b/scripts/install index ba0a0ba..c014b0e 100755 --- a/scripts/install +++ b/scripts/install @@ -15,18 +15,6 @@ source /usr/share/yunohost/helpers timezone="$(cat /etc/timezone)" -fpm_footprint="low" -fpm_free_footprint=0 -fpm_usage="low" - -#================================================= -# STORE SETTINGS FROM MANIFEST -#================================================= - -ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint -ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint -ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -49,7 +37,7 @@ chmod -R g+w $install_dir/translations/ ynh_script_progression --message="Configuring PHP-FPM..." --weight=1 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint +ynh_add_fpm_config # Create a dedicated NGINX config ynh_add_nginx_config diff --git a/scripts/upgrade b/scripts/upgrade index 4825bf9..f3837c7 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -21,29 +21,6 @@ timezone="$(cat /etc/timezone)" upgrade_type=$(ynh_check_app_version_changed) -#================================================= -# ENSURE DOWNWARD COMPATIBILITY -#================================================= -ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 - -# If fpm_footprint doesn't exist, create it -if [ -z "${fpm_footprint:-}" ]; then - fpm_footprint=low - ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint -fi - -# If fpm_free_footprint doesn't exist, create it -if [ -z "${fpm_free_footprint:-}" ]; then - fpm_free_footprint=0 - ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint -fi - -# If fpm_usage doesn't exist, create it -if [ -z "${fpm_usage:-}" ]; then - fpm_usage=low - ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage -fi - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -70,7 +47,7 @@ chmod -R g+w $install_dir/translations/ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint +ynh_add_fpm_config # Create a dedicated NGINX config ynh_add_nginx_config