diff --git a/README.md b/README.md index ab41b84..2263421 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Simple, modern, lightweight & fast web-based email client. The drastically upgraded & secured fork of RainLoop Webmail Community edition. -**Shipped version:** 2.29.1~ynh2 +**Shipped version:** 2.29.1~ynh3 **Demo:** https://snappymail.eu/demo/ diff --git a/README_fr.md b/README_fr.md index f8e514f..11edf32 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Client de messagerie Web simple, moderne, léger et rapide. Snappymail est un fork considérablement amélioré et sécurisé de l'édition RainLoop Webmail Community. -**Version incluse :** 2.29.1~ynh2 +**Version incluse :** 2.29.1~ynh3 **Démo :** https://snappymail.eu/demo/ diff --git a/manifest.toml b/manifest.toml index 08b9294..a03db09 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "SnappyMail" description.en = "Simple, modern, lightweight & fast web-based e-mail client" description.fr = "Client de messagerie Web simple, moderne, léger et rapide" -version = "2.29.1~ynh2" +version = "2.29.1~ynh3" maintainers = ["eric_G"] diff --git a/scripts/change_url b/scripts/change_url index 20ecf75..84fc887 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -9,6 +9,13 @@ source _common.sh source /usr/share/yunohost/helpers +#================================================= +# MODIFY URL IN NGINX CONF +#================================================= +ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1 + +ynh_change_url_nginx_config + #================================================= # UPDATE A CONFIG FILE #================================================= @@ -24,14 +31,7 @@ chown $app:$app "$install_dir/app/data/_data_/_default_/configs/application.ini" #================================================= ynh_script_progression --message="Applying SSO patch..." --weight=1 -ynh_add_config --template="../conf/sso.php" --destination="$install_dir/index.php" - -#================================================= -# MODIFY URL IN NGINX CONF -#================================================= -ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1 - -ynh_change_url_nginx_config +ynh_add_config --template="sso.php" --destination="$install_dir/index.php" #================================================= # END OF SCRIPT diff --git a/scripts/install b/scripts/install index e5da137..f1ed103 100755 --- a/scripts/install +++ b/scripts/install @@ -62,7 +62,7 @@ chown $app:$app -R "$install_dir/app/data/_data_" ynh_add_config --template="application.ini" --destination="$install_dir/app/data/_data_/_default_/configs/application.ini" -chmod 400 "$install_dir/app/data/_data_/_default_/configs/application.ini" +chmod 600 "$install_dir/app/data/_data_/_default_/configs/application.ini" chown $app:$app "$install_dir/app/data/_data_/_default_/configs/application.ini" #=================================================