Merge pull request #1 from YunoHost-Apps/testing

Testing

README.md

@@ -16,15 +16,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 ## Overview
 
-Some long and extensive description of what the app is and does, lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+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.
-
-### Features
-
-- Ut enim ad minim veniam, quis nostrud exercitation ullamco ;
-- Laboris nisi ut aliquip ex ea commodo consequat ;
-- Duis aute irure dolor in reprehenderit in voluptate ;
-- Velit esse cillum dolore eu fugiat nulla pariatur ;
-- Excepteur sint occaecat cupidatat non proident, sunt in culpa."
 
 
 **Shipped version:** 3.6.3~ynh1
@@ -35,7 +27,7 @@ Some long and extensive description of what the app is and does, lorem ipsum dol
 
 ## Documentation and resources
 
-* Official app website: <https://xbackbone.app/>
+* Official admin documentation: <https://xbackbone.app/>
 * Upstream app code repository: <https://github.com/SergiX44/XBackBone>
 * YunoHost documentation for this app: <https://yunohost.org/app_xbackbone>
 * Report a bug: <https://github.com/YunoHost-Apps/xbackbone_ynh/issues>

README_fr.md

@@ -16,15 +16,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 
 ## Vue d’ensemble
 
-Some long and extensive description of what the app is and does, lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+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.
-
-### Features
-
-- Ut enim ad minim veniam, quis nostrud exercitation ullamco ;
-- Laboris nisi ut aliquip ex ea commodo consequat ;
-- Duis aute irure dolor in reprehenderit in voluptate ;
-- Velit esse cillum dolore eu fugiat nulla pariatur ;
-- Excepteur sint occaecat cupidatat non proident, sunt in culpa."
 
 
 **Version incluse :** 3.6.3~ynh1
@@ -35,7 +27,7 @@ Some long and extensive description of what the app is and does, lorem ipsum dol
 
 ## Documentations et ressources
 
-* Site officiel de l’app : <https://xbackbone.app/>
+* Documentation officielle de l’admin : <https://xbackbone.app/>
 * Dépôt de code officiel de l’app : <https://github.com/SergiX44/XBackBone>
 * Documentation YunoHost pour cette app : <https://yunohost.org/app_xbackbone>
 * Signaler un bug : <https://github.com/YunoHost-Apps/xbackbone_ynh/issues>

conf/config.php

@@ -1,15 +1,15 @@
 <?php
 
 return [
-    'base_url' => 'https://__DOMAIN____PATH__', // no trailing slash
+    'base_url' => 'https://__DOMAIN____PATH__',
+    'storage' => [
+        'driver' => 'local',
+        'path'   => '__DATA_DIR__/storage',
+    ],
     'db'       => [
         'connection' => 'sqlite',
         'dsn'        => '__INSTALL_DIR__/resources/database/xbackbone.db',
         'username'   => null,
         'password'   => null,
-    ],
+    ]
-    'storage' => [
-        'driver' => 'local',
-        'path'   => '__INSTALL_DIR__/storage',
-    ],
 ];

conf/config_old.php

@@ -1,26 +0,0 @@
-<?php
-
-return array(
-    'base_url' => 'https://__DOMAIN____PATH__',
-    'db' => array (
-        'connection' => 'mysql',
-        'dsn' => 'host=localhost;port=3306;dbname=__DB_USER__',
-        'username' => '__DB_USER__',
-        'password' => '__DB_PWD__',
-    ),
-
-    'storage'  => array(
-        'driver' => 'local',
-        'path'   => '__DATA_DIR__',
-    ),
-
-    'ldap' => array(
-        'enabled' => true,
-        'host' => 'ldap://127.0.0.1',
-        'port' => 389,
-        'base_domain' => 'dc=yunohost,dc=org',
-        'user_domain' => 'ou=Users',
-        'rdn_attribute' => 'uid=',
-    ),
-);
-

conf/extra_php-fpm.conf

@@ -1,4 +1,4 @@
 ; Additional php.ini defines, specific to this pool of workers.
 
-php_admin_value[upload_max_filesize] = 50M
+php_admin_value[upload_max_filesize] = 512M
-php_admin_value[post_max_size] = 50M
+php_admin_value[post_max_size] = 512M

conf/nginx.conf

@@ -6,9 +6,9 @@ location __PATH__/ {
 
   index index.html index.htm index.php;
 
-  #client_max_body_size 50M;
+  client_max_body_size 512M;
 
-  try_files $uri $uri/ __PATH__/index.php?$query_string;
+  try_files $uri $uri/ __PATH__/index.php;
 
   location ~ [^/]\.php(/|$) {
     fastcgi_split_path_info ^(.+?\.php)(/.*)$;

doc/DESCRIPTION.md

@@ -1,9 +1 @@
-Some long and extensive description of what the app is and does, lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+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.
-
-### Features
-
-- Ut enim ad minim veniam, quis nostrud exercitation ullamco ;
-- Laboris nisi ut aliquip ex ea commodo consequat ;
-- Duis aute irure dolor in reprehenderit in voluptate ;
-- Velit esse cillum dolore eu fugiat nulla pariatur ;
-- Excepteur sint occaecat cupidatat non proident, sunt in culpa."

doc/DESCRIPTION_fr.md

@@ -0,0 +1 @@
+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.

doc/POST_INSTALL.md

@@ -0,0 +1 @@
+Login with `admin/admin`, be sure to change these credentials after your first login.

doc/POST_INSTALL_fr.md

@@ -0,0 +1 @@
+Connectez-vous avec `admin/admin`, assurez-vous de changer ces informations d'identification après votre première connexion.

manifest.toml

@@ -11,8 +11,9 @@ maintainers = ["eric_G"]
 
 [upstream]
 license = "AGPL-3.0"
-website = "https://xbackbone.app/"
+admindoc = "https://xbackbone.app/"
 code = "https://github.com/SergiX44/XBackBone"
+fund = "https://xbackbone.app/sponsor.html"
 
 [integration]
 yunohost = ">= 11.2"
@@ -47,12 +48,10 @@ ram.runtime = "50M"
     [resources.install_dir]
 
     [resources.data_dir]
+    subdirs = ["storage"]
 
     [resources.permissions]
     main.url = "/"
 
     [resources.apt]
-    packages = "mariadb-server php8.2-sqlite3 php8.2-mysql php8.2-gd php8.2-fileinfo php8.2-zip php8.2-ldap"
+    packages = "mariadb-server php8.2-sqlite3 php8.2-gd php8.2-fileinfo php8.2-zip"
-
-    [resources.database]
-    type = "mysql"

scripts/install

@@ -15,7 +15,7 @@ source /usr/share/yunohost/helpers
 ynh_script_progression --message="Setting up source files..." --weight=1
 
 ynh_setup_source --dest_dir="$install_dir"
-
+#mkdir "$install_dir/storage"
 chown -R $app:www-data "$install_dir"
 
 #=================================================
@@ -24,7 +24,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
+ynh_add_fpm_config --usage=low --footprint=low
 
 #=================================================
 # NGINX CONFIGURATION
@@ -39,7 +39,7 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Adding a configuration file..." --weight=1
 
-ynh_add_config --template="../conf/config_old.php" --destination="$install_dir/config.php"
+ynh_add_config --template="../conf/config.php" --destination="$install_dir/config.php"
 
 chmod 400 "$install_dir/config.php"
 chown $app:$app "$install_dir/config.php"

scripts/remove

@@ -17,11 +17,6 @@ ynh_script_progression --message="Removing NGINX web server configuration..." --
 # Remove the dedicated NGINX config
 ynh_remove_nginx_config
 
-#=================================================
-# REMOVE PHP-FPM CONFIGURATION
-#=================================================
-ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=1
-
 # Remove the dedicated PHP-FPM config
 ynh_remove_fpm_config
 

scripts/restore

@@ -31,15 +31,10 @@ chown -R $app:www-data "$data_dir"
 #=================================================
 # RESTORE THE PHP-FPM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Restoring the PHP-FPM configuration..." --time --weight=1
+ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=1
 
 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
-#=================================================
-# RESTORE THE NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Restoring the NGINX web server configuration..." --time --weight=1
-
 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
 #=================================================

scripts/upgrade

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

tests.toml

@@ -0,0 +1,7 @@
+test_format = 1.0
+
+[default]
+
+    # ------------
+    # Tests to run
+    # ------------