Testing

README.md

@@ -1,8 +1,60 @@
-# Jirafeau package for YunoHost
-
-Easy drag&Drop file sharing.
+# Jirafeau for YunoHost
 
+[![Integration level](https://dash.yunohost.org/integration/jirafeau.svg)](https://dash.yunohost.org/appci/app/jirafeau)  
 [![Install Jirafeau with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=jirafeau)
 
-* [Jirafeau website](https://gitlab.com/mojo42/Jirafeau)
-* [YunoHost website](https://yunohost.org/)
+> *This package allow you to install Jirafeau quickly and simply on a YunoHost server.  
+If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.*
+
+## Overview
+
+Jirafeau is a web site permitting to upload a file in a simple way and give an unique link to it.
+
+**Shipped version:** 3.4.1
+
+## Screenshots
+
+![](http://i.imgur.com/TPjh48P.png)
+
+## Demo
+
+* [YunoHost demo](https://demo.yunohost.org/jirafeau/)
+
+## Configuration
+
+## Documentation
+
+ * Official documentation: 
+ * YunoHost documentation: If specific documentation is needed, feel free to contribute.
+
+## YunoHost specific features
+
+#### Supported architectures
+
+* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/jirafeau%20%28Official%29.svg)](https://ci-apps.yunohost.org/ci/apps/jirafeau/)
+* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/jirafeau%20%28Official%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/jirafeau/)
+* Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/ci/logs/jirafeau%20%28Official%29.svg)](https://ci-stretch.nohost.me/ci/apps/jirafeau/)
+
+## Limitations
+
+## Additional information
+
+## Links
+
+ * Report a bug: https://github.com/YunoHost-Apps/jirafeau_ynh/issues
+ * Jirafeau website: https://gitlab.com/mojo42/Jirafeau
+ * YunoHost website: https://yunohost.org/
+
+---
+
+Developers info
+----------------
+
+Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/jirafeau_ynh/tree/testing).
+
+To try the testing branch, please proceed like that.
+```
+sudo yunohost app install https://github.com/YunoHost-Apps/jirafeau_ynh/tree/testing --debug
+or
+sudo yunohost app upgrade jirafeau -u https://github.com/YunoHost-Apps/jirafeau_ynh/tree/testing --debug
+```

check_process

@@ -1,5 +1,4 @@
 ;; Test complet
-	auto_remove=1
 	; Manifest
 		domain="domain.tld"	(DOMAIN)
 		path="/path"	(PATH)

conf/config.local.php

@@ -27,11 +27,11 @@
 
 /* URL of installation, with traling slash (eg. »https://exmaple.com/jirafeau/«)
  */
-$cfg['web_root'] = 'https://' . 'YNH_DOMAIN' . 'YNH_WWW_PATH' . '/';
+$cfg['web_root'] = 'https://' . '__YNH_DOMAIN__' . '__YNH_WWW_PATH__' . '/';
 
 /* Path to data directory, with trailing slash (eg. »/var/www/data/var_314159265358979323846264«
  */
-$cfg['var_root'] = 'YNH_VAR_ROOT' . '/';
+$cfg['var_root'] = '__YNH_VAR_ROOT__' . '/';
 
 /* Language - choice between 'auto' or any language located in the /lib/locales/ folder.
  * The mode »auto« will cause the script to detect the user's browser information
@@ -74,7 +74,7 @@
  * $cfg['upload_password'] = array('psw1');         // One password
  * $cfg['upload_password'] = array('psw1', 'psw2'); // Two passwords
  */
-$cfg['upload_password'] = array(YNH_UPLOAD_PASSWORD);
+$cfg['upload_password'] = array(__YNH_UPLOAD_PASSWORD__);
 
 /* List of IP allowed to upload a file.
  * If the list is empty, then there is no upload restriction based on IP.
@@ -96,7 +96,7 @@
  * that the provided user is logged in.
  * If »admin_password« parameter is set, then the »admin_password« is ignored.
  */
-$cfg['admin_http_auth_user'] = 'YNH_ADMIN_USER';
+$cfg['admin_http_auth_user'] = '__YNH_ADMIN_USER__';
 
 /* Allow user to select different options for file expiration time.
  * Possible values in array:

conf/nginx.conf

@@ -1,18 +1,24 @@
 #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
 location __PATH__/ {
+
+	# Path to source
 	alias __FINALPATH__/ ;
+
+	# Force usage of https
 	if ($scheme = http) {
 		rewrite ^ https://$server_name$request_uri? permanent;
 	}
+
 	client_max_body_size 10G;
 	client_body_timeout 30m;
 	proxy_read_timeout 30m;
+
 	index index.php;
 	try_files $uri $uri/ index.php;
 
 	location ~ ^__PATH__/lib/functions.js.php {
 		fastcgi_split_path_info ^(.+?\.php)(/.*)$;
-		fastcgi_pass unix:/var/run/php5-fpm-__NAME__.sock;
+		fastcgi_pass unix:/var/run/php/php7.0-fpm-__NAME__.sock;
 		fastcgi_index index.php;
 		include fastcgi_params;
 		fastcgi_param REMOTE_USER     $remote_user;
@@ -21,12 +27,14 @@ location __PATH__/ {
 		fastcgi_read_timeout 30m;
 		fastcgi_send_timeout 30m;
 	}
+
 	location ~ ^__PATH__/lib/.*\.php {
 		deny all;
 	}
+
 	location ~ [^/]\.php(/|$) {
 		fastcgi_split_path_info ^(.+?\.php)(/.*)$;
-		fastcgi_pass unix:/var/run/php5-fpm-__NAME__.sock;
+		fastcgi_pass unix:/var/run/php/php7.0-fpm-__NAME__.sock;
 		fastcgi_index index.php;
 		include fastcgi_params;
 		fastcgi_param REMOTE_USER     $remote_user;