diff --git a/README.md b/README.md index fec839b..ddf4cc5 100755 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -**Shipped version:** 3.3.1 +**Shipped version:** 3.3.2 ## Screenshots @@ -39,8 +39,8 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in #### Supported architectures -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mautic%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/mautic/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/mautic%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/mautic/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mautic.svg)](https://ci-apps.yunohost.org/ci/apps/mautic/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/mautic.svg)](https://ci-apps-arm.yunohost.org/ci/apps/mautic/) ## Limitations diff --git a/README_fr.md b/README_fr.md index b65d982..74de485 100644 --- a/README_fr.md +++ b/README_fr.md @@ -10,7 +10,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install ## Vue d'ensemble -**Version incluse :** 3.3.1 +**Version incluse :** 3.3.2 ## Captures d'écran @@ -39,8 +39,8 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install #### Architectures supportées -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mautic%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/mautic/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/mautic%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/mautic/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mautic.svg)](https://ci-apps.yunohost.org/ci/apps/mautic/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/mautic.svg)](https://ci-apps-arm.yunohost.org/ci/apps/mautic/) ## Limitations diff --git a/check_process b/check_process index e621d9d..57aa1df 100755 --- a/check_process +++ b/check_process @@ -16,7 +16,6 @@ upgrade=1 backup_restore=1 multi_instance=1 - port_already_use=0 change_url=0 ;;; Options Email= diff --git a/conf/app.src b/conf/app.src index 1e60f08..5402c4d 100755 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://github.com/mautic/mautic/releases/download/3.3.1/3.3.1.zip -SOURCE_SUM=10d5be5a70750a93ebfac994f2f5adfab9b54bc46ba4295c5aac4ef6e74d1b2a +SOURCE_URL=https://github.com/mautic/mautic/releases/download/3.3.2/3.3.2.zip +SOURCE_SUM=58666c42b8fbe0284c7e4cf80228abb05448cfe8932bda2d7e9d64c6d65a1fe8 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false -SOURCE_FILENAME=3.3.1.zip +SOURCE_FILENAME=3.3.2.zip diff --git a/manifest.json b/manifest.json index 1348d7d..51ff3a6 100755 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Open Source Marketing Automation Software.", "fr": "Logiciel d'automatisation marketing open source." }, - "version": "3.3.1~ynh1", + "version": "3.3.2~ynh1", "url": "https://www.mautic.org/", "license": "GPL-3.0-only", "maintainer": { diff --git a/scripts/install b/scripts/install index e05e750..64121d4 100755 --- a/scripts/install +++ b/scripts/install @@ -110,11 +110,7 @@ chmod -R g+w $final_path/translations/ #================================================= ynh_script_progression --message="Setuping a cron..." -cp ../conf/cron /etc/cron.d/$app - -ynh_replace_string --match_string="__FINALPATH__" --replace_string="$final_path" --target_file="/etc/cron.d/$app" -ynh_replace_string --match_string="__PHPVERSION__" --replace_string="$phpversion" --target_file="/etc/cron.d/$app" -ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_file="/etc/cron.d/$app" +ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" chmod 644 "/etc/cron.d/$app" @@ -139,7 +135,7 @@ chmod 644 "/etc/cron.d/$app" #================================================= # SETUP SSOWAT #================================================= -ynh_script_progression --message="Configuring SSOwat..." --weight=10 +ynh_script_progression --message="Configuring permissions..." --weight=10 # Make app public if necessary or protect it if [ $is_public -eq 1 ] @@ -154,7 +150,6 @@ ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload - #================================================= # SEND A README FOR THE ADMIN #================================================= diff --git a/scripts/restore b/scripts/restore index 26ead8e..573deb0 100755 --- a/scripts/restore +++ b/scripts/restore @@ -72,8 +72,13 @@ ynh_system_user_create --username=$app #================================================= # Set permissions to app files -chown -R $app: $final_path -chmod -R 755 $final_path +chown -R $app:www-data $final_path +#chmod -R g+w $final_path/app/cache/ +#chmod -R g+w $final_path/app/logs/ +chmod -R g+w $final_path/app/config/ +chmod -R g+w $final_path/media/files/ +chmod -R g+w $final_path/media/images/ +chmod -R g+w $final_path/translations/ #================================================= # RESTORE THE PHP-FPM CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index 2444e21..b699702 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -108,8 +108,14 @@ ynh_add_fpm_config --package="$extra_php_dependencies" #================================================= # Set permissions to app files -chown -R $app: $final_path -chmod -R 755 $final_path +chown -R $app:www-data $final_path +#chmod -R g+w $final_path/app/cache/ +#chmod -R g+w $final_path/app/logs/ +chmod -R g+w $final_path/app/config/ +chmod -R g+w $final_path/media/files/ +chmod -R g+w $final_path/media/images/ +chmod -R g+w $final_path/translations/ + #================================================= # RELOAD NGINX