From 9f26e14461736cef6004d2373f709009e41b0f76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 26 Nov 2023 14:45:38 +0100 Subject: [PATCH 01/10] Update manifest.toml --- manifest.toml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index e0de9d6..cb7c960 100644 --- a/manifest.toml +++ b/manifest.toml @@ -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" @@ -53,7 +56,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" From 6e9dee5e8733e489313c4f14240eef7008533f1a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 26 Nov 2023 13:45:44 +0000 Subject: [PATCH 02/10] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 68a855c..0a030fa 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ XBackBone is a simple and lightweight PHP file manager that support the instant * Official admin documentation: * Upstream app code repository: -* YunoHost documentation for this app: +* YunoHost Store: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 9ff4800..330a9c5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -29,7 +29,7 @@ XBackBone est un gestionnaire de fichiers PHP simple et léger qui prend en char * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : +* YunoHost Store: * Signaler un bug : ## Informations pour les développeurs From ed822b0201c17ebb494f5237d48039a11e0dc530 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 26 Nov 2023 14:47:34 +0100 Subject: [PATCH 03/10] cleaning --- scripts/install | 9 ++------- scripts/upgrade | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/scripts/install b/scripts/install index 28274c0..f925800 100755 --- a/scripts/install +++ b/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 @@ -41,7 +36,7 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Adding a configuration file..." --weight=1 -ynh_add_config --template="../conf/config.php" --destination="$install_dir/config.php" +ynh_add_config --template="config.php" --destination="$install_dir/config.php" chmod 400 "$install_dir/config.php" chown $app:$app "$install_dir/config.php" diff --git a/scripts/upgrade b/scripts/upgrade index 8e45d34..b752d65 100644 --- a/scripts/upgrade +++ b/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 From b5448f2f09e16a8758b4db649e7397d46e5d3a5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 26 Nov 2023 14:48:47 +0100 Subject: [PATCH 04/10] Update config.php --- conf/config.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/config.php b/conf/config.php index e0ba663..aaa878e 100644 --- a/conf/config.php +++ b/conf/config.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', ), ); From 224ab4327a9df36e2aad84e440d87426a27855de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 26 Nov 2023 15:19:16 +0100 Subject: [PATCH 05/10] Update tests.toml --- tests.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests.toml b/tests.toml index 8a6579f..f185800 100644 --- a/tests.toml +++ b/tests.toml @@ -6,4 +6,4 @@ test_format = 1.0 # Tests to run # ------------ - exclude = ["install.root"] + #exclude = ["install.root"] From 21923ce21552311d11d836c730f8a077bee34e74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 26 Nov 2023 16:02:31 +0100 Subject: [PATCH 06/10] Update nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 305e968..36dc054 100644 --- a/conf/nginx.conf +++ b/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/ /index.php?$query_string; location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; From 66d7357017231cdb2b5cfb8270c5add3d64e982d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 26 Nov 2023 16:28:41 +0100 Subject: [PATCH 07/10] Update nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 36dc054..8c0c828 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -8,7 +8,7 @@ location __PATH__/ { client_max_body_size 1G; - try_files $uri $uri/ /index.php?$query_string; + try_files $uri $uri/ __PATH__/index.php?$query_string; location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; From 3e4d3de6228e6a28c00b8b741cdc22eff50d2aae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 9 Feb 2024 11:19:02 +0100 Subject: [PATCH 08/10] Update manifest.toml --- manifest.toml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/manifest.toml b/manifest.toml index cb7c960..6e8ee0f 100644 --- a/manifest.toml +++ b/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"] @@ -42,10 +42,11 @@ 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] [resources.install_dir] From d5ea1e7060d14505a8b09349f9dd9c58fba11a62 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 9 Feb 2024 10:19:07 +0000 Subject: [PATCH 09/10] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0a030fa..a28d8c6 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 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 diff --git a/README_fr.md b/README_fr.md index 330a9c5..1fe2b9d 100644 --- a/README_fr.md +++ b/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 From 3b275d9e64884d76126bda392617f9006fe22b32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 9 Feb 2024 17:47:00 +0100 Subject: [PATCH 10/10] Update nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 8c0c828..e67414b 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -8,7 +8,7 @@ location __PATH__/ { client_max_body_size 1G; - try_files $uri $uri/ __PATH__/index.php?$query_string; + try_files $uri $uri/ __PATH__/index.php location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$;