Merge branch 'testing'

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
 
@@ -25,6 +35,9 @@ Improved File Manager
 
 ![](./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

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
 
@@ -21,6 +31,9 @@ Improved File Manager
 
 ![](./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

conf/nginx.conf

@@ -11,7 +11,8 @@ location __PATH__/ {
 
   index ifm.php;
 
-  client_max_body_size 100M;
+  # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file
+  client_max_body_size 1G;
 
   try_files $uri $uri/ index.php;
   location ~ [^/]\.php(/|$) {

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[upload_max_filesize] = 1G
-php_admin_value[post_max_size] = 100M
+php_admin_value[post_max_size] = 1G
 ; php_admin_flag[mail.add_x_header] = Off
 
 ; Other common parameters
@@ -428,3 +428,6 @@ php_admin_value[post_max_size] = 100M
 ; 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))

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)

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).

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
+	mv -f "../conf/ifm.php" "$final_path/ifm.php"
-	#ynh_setup_source --dest_dir="$final_path"
-	ynh_add_config --template="../conf/ifm.php" --destination="$final_path/ifm.php"
 fi
 
 chmod 750 "$final_path"