Merge branch 'testing' into pr/9

README.md

@@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 XBackBone is a simple and lightweight PHP file manager that support the instant sharing tool ShareX and NIX systems. It supports uploading and displaying images, GIF, video, code, formatted text, pdf, and file downloading and uploading. Also have a web UI with multi user management, media gallery and search support.
 
 
-**Shipped version:** 3.6.3~ynh1
+**Shipped version:** 3.7.0~ynh1
 
 ## Screenshots
 

README_fr.md

@@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 XBackBone est un gestionnaire de fichiers PHP simple et léger qui prend en charge l'outil de partage instantané des systèmes ShareX et NIX. Il prend en charge le téléchargement et l'affichage d'images, GIF, vidéo, code, texte formaté, pdf et téléchargement et téléchargement de fichiers. Disposez également d'une interface utilisateur Web avec gestion multi-utilisateurs, galerie multimédia et prise en charge de la recherche.
 
 
-**Version incluse :** 3.6.3~ynh1
+**Version incluse :** 3.7.0~ynh1
 
 ## Captures d’écran
 

conf/config-withpath.php

@@ -21,7 +21,7 @@ return array(
         'port' => 389,
         'base_domain' => 'dc=yunohost,dc=org',
         'search_filter' => '(&(|(objectclass=posixAccount))(uid={{username}})(permission=cn=__APP__.main,ou=permission,dc=yunohost,dc=org))',
-        'user_domain' => 'ou=Users',
-        'rdn_attribute' => 'uid=',
+        'user_domain' => 'ou',
+        'rdn_attribute' => 'uid',
     ),
 );

conf/nginx.conf

@@ -8,7 +8,7 @@ location __PATH__/ {
 
   client_max_body_size 1G;
 
-  try_files $uri $uri/ __PATH__/index.php;
+  try_files $uri $uri/ __PATH__/index.php
 
   location ~ [^/]\.php(/|$) {
     fastcgi_split_path_info ^(.+?\.php)(/.*)$;

manifest.toml

@@ -5,7 +5,7 @@ name = "XBackBone"
 description.en = "Lightweight file manager with full ShareX support"
 description.fr = "Gestionnaire de fichiers léger avec prise en charge de ShareX"
 
-version = "3.6.3~ynh1"
+version = "3.7.0~ynh1"
 
 maintainers = ["eric_G"]
 
@@ -19,8 +19,11 @@ fund = "https://xbackbone.app/sponsor.html"
 yunohost = ">= 11.2"
 architectures = "all"
 multi_instance = true
+
 ldap = false
+
 sso = false
+
 disk = "50M"
 ram.build = "50M"
 ram.runtime = "50M"
@@ -39,9 +42,10 @@ ram.runtime = "50M"
 
 [resources]
         [resources.sources.main]
-        url = "https://github.com/SergiX44/XBackBone/releases/download/3.6.3/release-v3.6.3.zip"
-        sha256 = "ac1b09a2c262714646d1593b131bcc6a88b836204b0ee02b8879b0e2c386678f"
+        url = "https://github.com/SergiX44/XBackBone/releases/download/3.7.0/release-v3.7.0.zip"
+        sha256 = "df35a21eec883b43baac968ed4bc28b3a4c0b491b0d0c4c2325ab38d69a1ff98"
         in_subdir = false
+        autoupdate.strategy = "latest_github_tag"
         
     [resources.system_user]
 
@@ -53,7 +57,7 @@ ram.runtime = "50M"
     main.url = "/"
 
     [resources.apt]
-    packages = "mariadb-server php8.2-intl php8.2-mysql php8.2-gd php8.2-fileinfo php8.2-zip php8.2-ldap"
+    packages = "mariadb-server, php8.2-intl, php8.2-mysql, php8.2-gd, php8.2-fileinfo, php8.2-zip, php8.2-ldap"
 
     [resources.database]
     type = "mysql"

scripts/install

@@ -26,12 +26,7 @@ chown -R $app:www-data "$install_dir"
 ynh_script_progression --message="Configuring PHP-FPM..." --weight=1
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --usage=low --footprint=low
-
-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Configuring NGINX web server..." --weight=1
+ynh_add_fpm_config
 
 # Create a dedicated NGINX config
 ynh_add_nginx_config

scripts/upgrade

@@ -45,7 +45,7 @@ popd
 ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --usage=low --footprint=low
+ynh_add_fpm_config
 
 # Create a dedicated NGINX config
 ynh_add_nginx_config

tests.toml

@@ -6,4 +6,4 @@ test_format = 1.0
     # Tests to run
     # ------------
 
-    exclude = ["install.root"]
+    #exclude = ["install.root"]