From b8e684c2a951c55822686c0d94b25cacbfb4509e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 19 Aug 2023 14:55:44 +0200 Subject: [PATCH 01/16] fix --- conf/config.php | 10 +++++----- scripts/install | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conf/config.php b/conf/config.php index fbe7c48..be0fefb 100644 --- a/conf/config.php +++ b/conf/config.php @@ -2,14 +2,14 @@ return [ 'base_url' => 'https://__DOMAIN____PATH__', // no trailing slash + 'storage' => [ + 'driver' => 'local', + 'path' => '__INSTALL_DIR__/storage', + ], 'db' => [ 'connection' => 'sqlite', 'dsn' => '__INSTALL_DIR__/resources/database/xbackbone.db', 'username' => null, 'password' => null, - ], - 'storage' => [ - 'driver' => 'local', - 'path' => '__INSTALL_DIR__/storage', - ], + ] ]; diff --git a/scripts/install b/scripts/install index ffb0232..49da682 100755 --- a/scripts/install +++ b/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" #================================================= @@ -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" From 50c78953ed10b4e23db857176fa7c21039718d91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 19 Aug 2023 14:59:49 +0200 Subject: [PATCH 02/16] 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 6b553f8..09c2f3a 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -8,7 +8,7 @@ location __PATH__/ { #client_max_body_size 50M; - try_files $uri $uri/ __PATH__/index.php?$query_string; + try_files $uri $uri/ __PATH__/index.php; location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; From fd85a5dce328a14e2d15004477343b90edb2ba51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 19 Aug 2023 15:05:52 +0200 Subject: [PATCH 03/16] cleaning --- scripts/install | 2 +- scripts/remove | 5 ----- scripts/upgrade | 7 +------ 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/scripts/install b/scripts/install index 49da682..fa03ef3 100755 --- a/scripts/install +++ b/scripts/install @@ -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 diff --git a/scripts/remove b/scripts/remove index 79cb058..61db822 100755 --- a/scripts/remove +++ b/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 diff --git a/scripts/upgrade b/scripts/upgrade index 61574c5..94685dd 100644 --- a/scripts/upgrade +++ b/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 - -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 +ynh_add_fpm_config --usage=low --footprint=low # Create a dedicated NGINX config ynh_add_nginx_config From c81a87a474038ba88323d283022fca32d0cd02c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 19 Aug 2023 15:07:17 +0200 Subject: [PATCH 04/16] fix --- manifest.toml | 2 +- scripts/restore | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/manifest.toml b/manifest.toml index 8d15e9d..cc530a0 100644 --- a/manifest.toml +++ b/manifest.toml @@ -11,7 +11,7 @@ maintainers = ["eric_G"] [upstream] license = "AGPL-3.0" -website = "https://xbackbone.app/" +admindoc = "https://xbackbone.app/" code = "https://github.com/SergiX44/XBackBone" [integration] diff --git a/scripts/restore b/scripts/restore index 7373550..7529ee6 100755 --- a/scripts/restore +++ b/scripts/restore @@ -35,11 +35,6 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." --time 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" #================================================= From 234e5c9c05bb6598c30c2de980868d59d588433a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 19 Aug 2023 13:07:21 +0000 Subject: [PATCH 05/16] 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 10c2575..0f76ae4 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ Some long and extensive description of what the app is and does, lorem ipsum dol ## Documentation and resources -* Official app website: +* Official admin documentation: * Upstream app code repository: * YunoHost documentation for this app: * Report a bug: diff --git a/README_fr.md b/README_fr.md index 2e887ba..ce0cc11 100644 --- a/README_fr.md +++ b/README_fr.md @@ -35,7 +35,7 @@ Some long and extensive description of what the app is and does, lorem ipsum dol ## Documentations et ressources -* Site officiel de l’app : +* Documentation officielle de l’admin : * Dépôt de code officiel de l’app : * Documentation YunoHost pour cette app : * Signaler un bug : From 1ff9407bc99295012ff2dddf41b00f0d89fe65fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 19 Aug 2023 15:07:42 +0200 Subject: [PATCH 06/16] Update restore --- scripts/restore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index 7529ee6..8415626 100755 --- a/scripts/restore +++ b/scripts/restore @@ -31,7 +31,7 @@ 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" From 9ebca18c118c1ea2392166390f67aa53661588ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 19 Aug 2023 15:10:35 +0200 Subject: [PATCH 07/16] Create tests.toml --- tests.toml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 tests.toml diff --git a/tests.toml b/tests.toml new file mode 100644 index 0000000..91daf17 --- /dev/null +++ b/tests.toml @@ -0,0 +1,7 @@ +test_format = 1.0 + +[default] + + # ------------ + # Tests to run + # ------------ \ No newline at end of file From 5d1abd4e21d96d62c75b0a3042a53b6959898098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 19 Aug 2023 15:12:11 +0200 Subject: [PATCH 08/16] 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 09c2f3a..e4bb875 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -6,7 +6,7 @@ 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; From d68e220a327088ac236276a5af4fea794303126e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 19 Aug 2023 15:15:31 +0200 Subject: [PATCH 09/16] Create DESCRIPTION_fr.md --- doc/DESCRIPTION_fr.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/DESCRIPTION_fr.md diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md new file mode 100644 index 0000000..eea5ac7 --- /dev/null +++ b/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. From 241ce07680d5278cf458453c28654dc3e50a006d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 19 Aug 2023 13:15:35 +0000 Subject: [PATCH 10/16] Auto-update README --- README_fr.md | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/README_fr.md b/README_fr.md index ce0cc11..9f84d23 100644 --- a/README_fr.md +++ b/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. - -### 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." +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 From 65487707b88eb5f7181c388459f93215c426619a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 19 Aug 2023 15:17:43 +0200 Subject: [PATCH 11/16] fix --- conf/extra_php-fpm.conf | 4 ++-- doc/DESCRIPTION.md | 10 +--------- manifest.toml | 1 + 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/conf/extra_php-fpm.conf b/conf/extra_php-fpm.conf index 700c37c..9dacb8a 100644 --- a/conf/extra_php-fpm.conf +++ b/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[post_max_size] = 50M +php_admin_value[upload_max_filesize] = 512M +php_admin_value[post_max_size] = 512M diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index 0685205..06e08f9 100644 --- a/doc/DESCRIPTION.md +++ b/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. - -### 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." +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. diff --git a/manifest.toml b/manifest.toml index cc530a0..b3988d1 100644 --- a/manifest.toml +++ b/manifest.toml @@ -13,6 +13,7 @@ maintainers = ["eric_G"] license = "AGPL-3.0" admindoc = "https://xbackbone.app/" code = "https://github.com/SergiX44/XBackBone" +fund = "https://xbackbone.app/sponsor.html" [integration] yunohost = ">= 11.2" From 9effe056ed696c20dc244f255cba4ba161689f5b Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 19 Aug 2023 13:17:51 +0000 Subject: [PATCH 12/16] Auto-update README --- README.md | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/README.md b/README.md index 0f76ae4..d051241 100644 --- a/README.md +++ b/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. - -### 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." +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 From 6e9ac751032c20aa2a86365ada24bee88c6123db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 19 Aug 2023 15:22:24 +0200 Subject: [PATCH 13/16] fix --- conf/config.php | 4 ++-- conf/config_old.php | 26 -------------------------- manifest.toml | 6 ++---- 3 files changed, 4 insertions(+), 32 deletions(-) delete mode 100644 conf/config_old.php diff --git a/conf/config.php b/conf/config.php index be0fefb..a4bc3b2 100644 --- a/conf/config.php +++ b/conf/config.php @@ -1,10 +1,10 @@ 'https://__DOMAIN____PATH__', // no trailing slash + 'base_url' => 'https://__DOMAIN____PATH__', 'storage' => [ 'driver' => 'local', - 'path' => '__INSTALL_DIR__/storage', + 'path' => '__DATA_DIR__/storage', ], 'db' => [ 'connection' => 'sqlite', diff --git a/conf/config_old.php b/conf/config_old.php deleted file mode 100644 index 7ab9a12..0000000 --- a/conf/config_old.php +++ /dev/null @@ -1,26 +0,0 @@ - '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=', - ), -); - diff --git a/manifest.toml b/manifest.toml index b3988d1..c644059 100644 --- a/manifest.toml +++ b/manifest.toml @@ -48,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" - - [resources.database] - type = "mysql" + packages = "mariadb-server php8.2-sqlite3 php8.2-gd php8.2-fileinfo php8.2-zip" From 5bf3a665a3a7fc32de275da8fff84f13f065c9f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 19 Aug 2023 15:23:53 +0200 Subject: [PATCH 14/16] fix --- doc/POST_INSTALL.md | 1 + doc/POST_INSTALL_fr.md | 1 + 2 files changed, 2 insertions(+) create mode 100644 doc/POST_INSTALL.md create mode 100644 doc/POST_INSTALL_fr.md diff --git a/doc/POST_INSTALL.md b/doc/POST_INSTALL.md new file mode 100644 index 0000000..5fa8e30 --- /dev/null +++ b/doc/POST_INSTALL.md @@ -0,0 +1 @@ +Login with `admin/admin`, be sure to change these credentials after your first login. diff --git a/doc/POST_INSTALL_fr.md b/doc/POST_INSTALL_fr.md new file mode 100644 index 0000000..baf274f --- /dev/null +++ b/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. From 048423efe9032628bfaf39e9305c3a4b6d37a0f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 19 Aug 2023 15:29:03 +0200 Subject: [PATCH 15/16] clean --- conf/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/config.php b/conf/config.php index a4bc3b2..c7c49b4 100644 --- a/conf/config.php +++ b/conf/config.php @@ -4,7 +4,7 @@ return [ 'base_url' => 'https://__DOMAIN____PATH__', 'storage' => [ 'driver' => 'local', - 'path' => '__DATA_DIR__/storage', + 'path' => '__INSTALL_DIR__/storage', ], 'db' => [ 'connection' => 'sqlite', From b929ff46c2068a37cfbc049ddefbe4af7e4d09d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 19 Aug 2023 15:30:22 +0200 Subject: [PATCH 16/16] fix --- conf/config.php | 2 +- scripts/install | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/config.php b/conf/config.php index c7c49b4..a4bc3b2 100644 --- a/conf/config.php +++ b/conf/config.php @@ -4,7 +4,7 @@ return [ 'base_url' => 'https://__DOMAIN____PATH__', 'storage' => [ 'driver' => 'local', - 'path' => '__INSTALL_DIR__/storage', + 'path' => '__DATA_DIR__/storage', ], 'db' => [ 'connection' => 'sqlite', diff --git a/scripts/install b/scripts/install index fa03ef3..a6bafe7 100755 --- a/scripts/install +++ b/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" +#mkdir "$install_dir/storage" chown -R $app:www-data "$install_dir" #=================================================