diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8f144f3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +*~ +*.sw[op] +.DS_Store diff --git a/README.md b/README.md index c2ccce3..3dbfedc 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ All your e-mail, from all your accounts, in one place. Cypht is not your father' Cypht is an application built entirely of plugins, or as we call them, module sets (which is obviously way cooler sounding than plugins), that are executed by the framework. Modules provide a flexible way to add new features or customize the program without hacking the code. -**Shipped version:** 2.2.0~ynh1 +**Shipped version:** 2.3.0~ynh1 ## Screenshots diff --git a/README_es.md b/README_es.md index 5afe4d5..47fa84b 100644 --- a/README_es.md +++ b/README_es.md @@ -21,7 +21,7 @@ All your e-mail, from all your accounts, in one place. Cypht is not your father' Cypht is an application built entirely of plugins, or as we call them, module sets (which is obviously way cooler sounding than plugins), that are executed by the framework. Modules provide a flexible way to add new features or customize the program without hacking the code. -**Versión actual:** 2.2.0~ynh1 +**Versión actual:** 2.3.0~ynh1 ## Capturas diff --git a/README_eu.md b/README_eu.md index 685036e..94e8f3f 100644 --- a/README_eu.md +++ b/README_eu.md @@ -21,7 +21,7 @@ All your e-mail, from all your accounts, in one place. Cypht is not your father' Cypht is an application built entirely of plugins, or as we call them, module sets (which is obviously way cooler sounding than plugins), that are executed by the framework. Modules provide a flexible way to add new features or customize the program without hacking the code. -**Paketatutako bertsioa:** 2.2.0~ynh1 +**Paketatutako bertsioa:** 2.3.0~ynh1 ## Pantaila-argazkiak diff --git a/README_fr.md b/README_fr.md index b170057..2b931a7 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Il NE doit PAS être modifié à la main. Cypht est un client de messagerie web. Vous pouvez accéder à vos comptes de messagerie qui supportent IMAP, POP3 ou SMTP - comme la plupart. -**Version incluse :** 2.2.0~ynh1 +**Version incluse :** 2.3.0~ynh1 ## Captures d’écran diff --git a/README_gl.md b/README_gl.md index 78e64af..f8f7456 100644 --- a/README_gl.md +++ b/README_gl.md @@ -21,7 +21,7 @@ All your e-mail, from all your accounts, in one place. Cypht is not your father' Cypht is an application built entirely of plugins, or as we call them, module sets (which is obviously way cooler sounding than plugins), that are executed by the framework. Modules provide a flexible way to add new features or customize the program without hacking the code. -**Versión proporcionada:** 2.2.0~ynh1 +**Versión proporcionada:** 2.3.0~ynh1 ## Capturas de pantalla diff --git a/README_id.md b/README_id.md index 9dc30db..edb0b36 100644 --- a/README_id.md +++ b/README_id.md @@ -21,7 +21,7 @@ All your e-mail, from all your accounts, in one place. Cypht is not your father' Cypht is an application built entirely of plugins, or as we call them, module sets (which is obviously way cooler sounding than plugins), that are executed by the framework. Modules provide a flexible way to add new features or customize the program without hacking the code. -**Versi terkirim:** 2.2.0~ynh1 +**Versi terkirim:** 2.3.0~ynh1 ## Tangkapan Layar diff --git a/README_ru.md b/README_ru.md index 7375ee1..dee2961 100644 --- a/README_ru.md +++ b/README_ru.md @@ -21,7 +21,7 @@ All your e-mail, from all your accounts, in one place. Cypht is not your father' Cypht is an application built entirely of plugins, or as we call them, module sets (which is obviously way cooler sounding than plugins), that are executed by the framework. Modules provide a flexible way to add new features or customize the program without hacking the code. -**Поставляемая версия:** 2.2.0~ynh1 +**Поставляемая версия:** 2.3.0~ynh1 ## Снимки экрана diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 788c146..156560c 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -21,7 +21,7 @@ All your e-mail, from all your accounts, in one place. Cypht is not your father' Cypht is an application built entirely of plugins, or as we call them, module sets (which is obviously way cooler sounding than plugins), that are executed by the framework. Modules provide a flexible way to add new features or customize the program without hacking the code. -**分发版本：** 2.2.0~ynh1 +**分发版本：** 2.3.0~ynh1 ## 截图 diff --git a/manifest.toml b/manifest.toml index 437b098..de5535f 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Cypht" description.en = "Lightweight Open Source webmail" description.fr = "Webmail Open Source léger" -version = "2.2.0~ynh1" +version = "2.3.0~ynh1" maintainers = [] @@ -16,7 +16,7 @@ admindoc = "https://cypht.org/install.html" code = "https://github.com/cypht-org/cypht" [integration] -yunohost = ">= 11.2.18" +yunohost = ">= 11.2.29" helpers_version = "2.1" architectures = "all" multi_instance = true @@ -54,8 +54,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url= "https://github.com/cypht-org/cypht/archive/refs/tags/v2.2.0.tar.gz" - sha256 = "7476aeeb55377e67d19aca40f5bc7758646396fcfca252c4631f81b36c717a8f" + url= "https://github.com/cypht-org/cypht/archive/refs/tags/v2.3.0.tar.gz" + sha256 = "7adae938a3fd5b7b2cfa473baf7855ea9fc8203ca780b14bf3f91eb7887b19e0" autoupdate.strategy = "latest_github_tag" [resources.system_user] diff --git a/scripts/remove b/scripts/remove index 8069c9c..ee9c6ec 100755 --- a/scripts/remove +++ b/scripts/remove @@ -8,10 +8,8 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression "Removing system configurations related to $app..." -# Remove the dedicated NGINX config ynh_config_remove_nginx -# Remove the dedicated PHP-FPM config ynh_config_remove_phpfpm #================================================= diff --git a/scripts/restore b/scripts/restore index 811a12a..b9a21e5 100755 --- a/scripts/restore +++ b/scripts/restore @@ -1,6 +1,5 @@ #!/bin/bash -# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers @@ -11,8 +10,6 @@ ynh_script_progression "Restoring the app main directory..." ynh_restore "$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R $app:www-data "$install_dir" #================================================= # RESTORE THE DATA DIRECTORY #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index d7f7fb6..acf8b47 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -14,20 +14,15 @@ timezone=$(cat /etc/timezone) #================================================= ynh_script_progression "Upgrading source files..." -# Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" #--full_replace #--keep=".env" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R $app:www-data "$install_dir" #================================================= # REAPPLY SYSTEM CONFIGURATIONS #================================================= ynh_script_progression "Upgrading system configurations related to $app..." -# Create a dedicated PHP-FPM config ynh_config_add_phpfpm -# Create a dedicated NGINX config ynh_config_add_nginx #================================================= @@ -45,9 +40,6 @@ ynh_script_progression "Adding $app's configuration..." ynh_config_add --template=".env" --destination="$install_dir/.env" -#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod 400 "$install_dir/.env" -#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown $app:$app "$install_dir/.env" - #================================================= # END OF SCRIPT #=================================================