diff --git a/README.md b/README.md index 822304a..109916b 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ It shall NOT be edited by hand. Web-based cross-platform XMPP client -**Shipped version:** 0.25.1~ynh1 +**Shipped version:** 0.25.1~ynh2 **Demo:** diff --git a/README_es.md b/README_es.md index 56bb8aa..36ef922 100644 --- a/README_es.md +++ b/README_es.md @@ -19,7 +19,7 @@ No se debe editar a mano. Web-based cross-platform XMPP client -**Versión actual:** 0.25.1~ynh1 +**Versión actual:** 0.25.1~ynh2 **Demo:** diff --git a/README_eu.md b/README_eu.md index 8515d58..dfa4ca4 100644 --- a/README_eu.md +++ b/README_eu.md @@ -19,7 +19,7 @@ EZ editatu eskuz. Web-based cross-platform XMPP client -**Paketatutako bertsioa:** 0.25.1~ynh1 +**Paketatutako bertsioa:** 0.25.1~ynh2 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 1f70758..d768e90 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Il NE doit PAS être modifié à la main. Client XMPP multiplateforme basé sur le Web -**Version incluse :** 0.25.1~ynh1 +**Version incluse :** 0.25.1~ynh2 **Démo :** diff --git a/README_gl.md b/README_gl.md index 55080f8..f9ae5e4 100644 --- a/README_gl.md +++ b/README_gl.md @@ -19,7 +19,7 @@ NON debe editarse manualmente. Web-based cross-platform XMPP client -**Versión proporcionada:** 0.25.1~ynh1 +**Versión proporcionada:** 0.25.1~ynh2 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 5a335dc..57dfbec 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -19,7 +19,7 @@ Web-based cross-platform XMPP client -**分发版本：** 0.25.1~ynh1 +**分发版本：** 0.25.1~ynh2 **演示：** diff --git a/conf/nginx.conf b/conf/nginx.conf index e8db4d8..6912550 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -9,7 +9,7 @@ location __PATH__/ { try_files $uri $uri/ __PATH__/index.php; location ~ [^/]\.php(/|$) { - # more_set_headers X-Cache $upstream_cache_status; + # more_set_headers "X-Cache: $upstream_cache_status"; # fastcgi_ignore_headers "Cache-Control" "Expires" "Set-Cookie"; # fastcgi_cache nginx_cache; # fastcgi_cache_valid any 7d; diff --git a/conf/systemd.service b/conf/systemd.service index 253e0b6..d59a132 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -1,5 +1,5 @@ [Unit] -Description=Movim: responsive web-based XMPP client +Description=Movim: web-based XMPP client After=nginx.service network.target local-fs.target [Service] diff --git a/config_panel.toml b/config_panel.toml.example similarity index 100% rename from config_panel.toml rename to config_panel.toml.example diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md index 171e3de..a753ca7 100644 --- a/doc/ADMIN_fr.md +++ b/doc/ADMIN_fr.md @@ -1,4 +1,4 @@ -Un utilisateur Jabber peut être mis admini via cette commande (iel doit s'être loggué une fois avant): +Un utilisateur Jabber peut être mis admin via cette commande (iel doit s'être loggué une fois avant) : ``` sudo -u __APP__ php__PHPVERSION__ __INSTALL_DIR__/daemon.php setAdmin ``` diff --git a/manifest.toml b/manifest.toml index 5bcad7a..5557797 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Movim" description.en = "Decentralized social platform based on XMPP" description.fr = "Plateforme sociale décentralisée basée sur XMPP" -version = "0.25.1~ynh1" +version = "0.25.1~ynh2" maintainers = [] @@ -25,6 +25,7 @@ architectures = "all" multi_instance = false ldap = false + sso = true disk = "50M" @@ -57,12 +58,12 @@ ram.runtime = "50M" [resources.apt] packages = [ - "php8.2-curl", - "php8.2-mbstring", - "php8.2-imagick", - "php8.2-gd", - "php8.2-pgsql", - "php8.2-xml", + "php8.3-curl", + "php8.3-mbstring", + "php8.3-imagick", + "php8.3-gd", + "php8.3-pgsql", + "php8.3-xml", "postgresql", "postgresql-contrib", "apt-transport-https", diff --git a/scripts/install b/scripts/install index 542d81c..dbd60d3 100644 --- a/scripts/install +++ b/scripts/install @@ -7,17 +7,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# INITIALIZE AND STORE SETTINGS -#================================================= - -fpm_footprint="low" -fpm_free_footprint=0 -fpm_usage="low" -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" - #================================================= # CONFIGURING A POSTGRESQL DATABASE #================================================= @@ -72,7 +61,7 @@ chown -R "$app:www-data" "$install_dir" ynh_script_progression --message="Adding system configurations related to $app..." --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/restore b/scripts/restore index 022cfba..bc38387 100644 --- a/scripts/restore +++ b/scripts/restore @@ -34,7 +34,7 @@ ynh_script_progression --message="Restoring system configurations related to $ap ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" # Recreate a dedicated PHP-FPM config -ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --phpversion=$phpversion +ynh_add_fpm_config ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" diff --git a/scripts/upgrade b/scripts/upgrade index 049a3c7..04df6c6 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -19,24 +19,6 @@ ynh_systemd_action --service_name="$app" --action="stop" --log_path="systemd" #================================================= ynh_script_progression --message="Ensuring downward compatibility..." -# 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 - if [ -f "$install_dir/config/db.inc.php" ]; then ynh_secure_remove --file="$install_dir/config/db.inc.php" fi @@ -75,7 +57,7 @@ chown "$app:$app" "$install_dir/.env" #================================================= # BUILD MOVIM #================================================= -ynh_script_progression --message="Building Movim..." +ynh_script_progression --message="Building $app..." ynh_exec_warn_less ynh_install_composer @@ -89,7 +71,7 @@ COMPOSER_ALLOW_SUPERUSER=1 ynh_exec_warn_less ynh_composer_exec --commands="movi ynh_script_progression --message="Upgrading system configurations related to $app..." --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