From 5b47dcd53cd0244c84053a485fc80a49698067e0 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 28 Aug 2021 17:06:14 +0200 Subject: [PATCH 01/11] Create DESCRIPTION.md --- doc/DESCRIPTION.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 doc/DESCRIPTION.md diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md new file mode 100644 index 0000000..e69de29 From 31637c829036bd21893069b7dd3ce1dd2e0fe3c3 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 28 Aug 2021 17:17:45 +0200 Subject: [PATCH 02/11] Update DESCRIPTION.md --- doc/DESCRIPTION.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index e69de29..8afa31e 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -0,0 +1,10 @@ +### features + +- create/edit files and directories +- copy/move files and directories +- download files and directories +- upload files directly, remotely via URL or per drag & drop +- extract archives (tar, tgz, tar.gz, tar.bz2, zip) +- change permissions +- image preview +- simple authentication (LDAP via ldap_bind possible) From 93236cba13fb0d374768f490838e34f626308a92 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sat, 28 Aug 2021 15:17:55 +0000 Subject: [PATCH 03/11] Auto-update README --- README.md | 12 +++++++++++- README_fr.md | 12 +++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b7a5fa1..41b87d7 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,17 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -Improved File Manager +### features + +- create/edit files and directories +- copy/move files and directories +- download files and directories +- upload files directly, remotely via URL or per drag & drop +- extract archives (tar, tgz, tar.gz, tar.bz2, zip) +- change permissions +- image preview +- simple authentication (LDAP via ldap_bind possible) + **Shipped version:** 2.6.3~ynh1 diff --git a/README_fr.md b/README_fr.md index 8adfe66..1e0c3ce 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,17 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble -Improved File Manager +### features + +- create/edit files and directories +- copy/move files and directories +- download files and directories +- upload files directly, remotely via URL or per drag & drop +- extract archives (tar, tgz, tar.gz, tar.bz2, zip) +- change permissions +- image preview +- simple authentication (LDAP via ldap_bind possible) + **Version incluse :** 2.6.3~ynh1 From 57c44ee498eab42b0a2a0c377b7dd916f3c7a868 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 28 Aug 2021 17:28:57 +0200 Subject: [PATCH 04/11] Add ldap --- conf/php-fpm.conf | 4 ++++ doc/DISCLAIMER.md | 1 + 2 files changed, 5 insertions(+) diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index ab1a471..48222d4 100644 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -428,3 +428,7 @@ chdir = __FINALPATH__ ; php_admin_value[max_input_time] = 300 ; php_admin_value[memory_limit] = 256M ; php_admin_flag[short_open_tag] = On + +env[IFM_AUTH] = 1 +env[IFM_AUTH_SOURCE] = ldap://127.0.0.1:389;ou=users,dc=yunohost,dc=org;(&(|(objectclass=posixAccount))(uid={{username}})(permission=cn=__APP__.main,ou=permission,dc=yunohost,dc=org)) + diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index e69de29..3c26e29 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -0,0 +1 @@ +The IFM is usually locked to it's own directory, so you are not able to go above. You can change that by setting the root_dir in the scripts [configuration](https://github.com/misterunknown/ifm/wiki/Configuration). \ No newline at end of file From e4a0ad17617e008efe7323b776b60a81f25bc6fc Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sat, 28 Aug 2021 15:29:13 +0000 Subject: [PATCH 05/11] Auto-update README --- README.md | 3 +++ README_fr.md | 3 +++ 2 files changed, 6 insertions(+) diff --git a/README.md b/README.md index 41b87d7..663cddc 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,9 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ![](./doc/screenshots/ifm_screenshot.png) +## Disclaimers / important information + +The IFM is usually locked to it's own directory, so you are not able to go above. You can change that by setting the root_dir in the scripts [configuration](https://github.com/misterunknown/ifm/wiki/Configuration). ## Documentation and resources * Official app website: https://github.com/misterunknown/ifm diff --git a/README_fr.md b/README_fr.md index 1e0c3ce..ce6d62b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -31,6 +31,9 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ![](./doc/screenshots/ifm_screenshot.png) +## Avertissements / informations importantes + +The IFM is usually locked to it's own directory, so you are not able to go above. You can change that by setting the root_dir in the scripts [configuration](https://github.com/misterunknown/ifm/wiki/Configuration). ## Documentations et ressources * Site officiel de l'app : https://github.com/misterunknown/ifm From d4ea08eb2e9c37808e02017754ee1b00a3e9e356 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 28 Aug 2021 17:38:26 +0200 Subject: [PATCH 06/11] Update upgrade --- scripts/upgrade | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 3c8b111..7489c3d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -51,16 +51,6 @@ if [ -z "$final_path" ]; then ynh_app_setting_set --app=$app --key=final_path --value=$final_path fi -### If nobody installed your app before 4.1, -### then you may safely remove these lines - -# Cleaning legacy permissions -if ynh_legacy_permissions_exists; then - ynh_legacy_permissions_delete_all - - ynh_app_setting_delete --app=$app --key=is_public -fi - #================================================= # CREATE DEDICATED USER #================================================= @@ -75,11 +65,9 @@ ynh_system_user_create --username=$app --home_dir="$final_path" if [ "$upgrade_type" == "UPGRADE_APP" ] then - ynh_script_progression --message="Upgrading source files..." --weight=3 + ynh_script_progression --message="Upgrading source files..." --weight=2 - # Download, check integrity, uncompress and patch the source from app.src - #ynh_setup_source --dest_dir="$final_path" - ynh_add_config --template="../conf/ifm.php" --destination="$final_path/ifm.php" + mv -f "../conf/ifm.php" "$final_path/ifm.php" fi chmod 750 "$final_path" From e9d3a0a4094971899770d902de83cdbedf53af82 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 28 Aug 2021 17:39:18 +0200 Subject: [PATCH 07/11] Update php-fpm.conf --- conf/php-fpm.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index 48222d4..5a683b9 100644 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -430,5 +430,4 @@ chdir = __FINALPATH__ ; php_admin_flag[short_open_tag] = On env[IFM_AUTH] = 1 -env[IFM_AUTH_SOURCE] = ldap://127.0.0.1:389;ou=users,dc=yunohost,dc=org;(&(|(objectclass=posixAccount))(uid={{username}})(permission=cn=__APP__.main,ou=permission,dc=yunohost,dc=org)) - +env[IFM_AUTH_SOURCE] = ldap;ou=users,dc=yunohost,dc=org;(&(|(objectclass=posixAccount))(uid={{username}})(permission=cn=__APP__.main,ou=permission,dc=yunohost,dc=org)) From ab24cd073ee6393cdb25efc21e5c8bd66c313f07 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 28 Aug 2021 17:42:55 +0200 Subject: [PATCH 08/11] Update php-fpm.conf --- conf/php-fpm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index 5a683b9..cc107ac 100644 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -430,4 +430,4 @@ chdir = __FINALPATH__ ; php_admin_flag[short_open_tag] = On env[IFM_AUTH] = 1 -env[IFM_AUTH_SOURCE] = ldap;ou=users,dc=yunohost,dc=org;(&(|(objectclass=posixAccount))(uid={{username}})(permission=cn=__APP__.main,ou=permission,dc=yunohost,dc=org)) +env[IFM_AUTH_SOURCE] = ldap;127.0.0.1:389;ou=users,dc=yunohost,dc=org;(&(|(objectclass=posixAccount))(uid={{username}})(permission=cn=__APP__.main,ou=permission,dc=yunohost,dc=org)) From a9c07281380283e8bdc54202df349c08a998958f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 28 Aug 2021 17:57:45 +0200 Subject: [PATCH 09/11] Update php-fpm.conf --- conf/php-fpm.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index cc107ac..7d0fe0f 100644 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -429,5 +429,5 @@ chdir = __FINALPATH__ ; php_admin_value[memory_limit] = 256M ; php_admin_flag[short_open_tag] = On -env[IFM_AUTH] = 1 -env[IFM_AUTH_SOURCE] = ldap;127.0.0.1:389;ou=users,dc=yunohost,dc=org;(&(|(objectclass=posixAccount))(uid={{username}})(permission=cn=__APP__.main,ou=permission,dc=yunohost,dc=org)) +; env[IFM_AUTH] = 1 +; env[IFM_AUTH_SOURCE] = ldap;127.0.0.1:389;ou=users,dc=yunohost,dc=org;(&(|(objectclass=posixAccount))(uid={{username}})(permission=cn=__APP__.main,ou=permission,dc=yunohost,dc=org)) From a7cf08d57a2ab0f26da844b94648153e0143dd81 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 28 Aug 2021 18:14:59 +0200 Subject: [PATCH 10/11] Fix --- conf/nginx.conf | 2 +- conf/php-fpm.conf | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 74cfd3b..4f765ab 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -12,7 +12,7 @@ location __PATH__/ { index ifm.php; # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file - #client_max_body_size 50M; + client_max_body_size 100M; try_files $uri $uri/ index.php; location ~ [^/]\.php(/|$) { diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index 7d0fe0f..b1f27d5 100644 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -419,8 +419,8 @@ chdir = __FINALPATH__ ;php_admin_value[memory_limit] = 32M ; Common values to change to increase file upload limit -; php_admin_value[upload_max_filesize] = 50M -; php_admin_value[post_max_size] = 50M +php_admin_value[upload_max_filesize] = 100M +php_admin_value[post_max_size] = 100M ; php_admin_flag[mail.add_x_header] = Off ; Other common parameters From 80bf756d98f10511ad11336102836f2e05b626e0 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 28 Aug 2021 18:17:39 +0200 Subject: [PATCH 11/11] Fix --- conf/nginx.conf | 2 +- conf/php-fpm.conf | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 4f765ab..6f7a86a 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -12,7 +12,7 @@ location __PATH__/ { index ifm.php; # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file - client_max_body_size 100M; + client_max_body_size 1G; try_files $uri $uri/ index.php; location ~ [^/]\.php(/|$) { diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index b1f27d5..7f2c855 100644 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -419,8 +419,8 @@ chdir = __FINALPATH__ ;php_admin_value[memory_limit] = 32M ; Common values to change to increase file upload limit -php_admin_value[upload_max_filesize] = 100M -php_admin_value[post_max_size] = 100M +php_admin_value[upload_max_filesize] = 1G +php_admin_value[post_max_size] = 1G ; php_admin_flag[mail.add_x_header] = Off ; Other common parameters