From 4d59043a5968828737abdf4472842fc17a9d6c49 Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackcrudelis@users.noreply.github.com>
Date: Fri, 2 Jun 2017 17:49:54 +0200
Subject: [PATCH] [enh] Update nginx.conf

---
 conf/nginx.conf | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 8c76342..74fc4df 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,7 +1,11 @@
-location YNH_WWW_PATH {
+location __PATH__ {
 
   # Path to source
-  alias YNH_WWW_ALIAS ;
+  alias __FINALPATH__/ ;
+
+  if ($scheme = http) {
+    rewrite ^ https://$server_name$request_uri? permanent;
+  }
 
   # Example PHP configuration (remove if not used)
   index index.php;
@@ -12,13 +16,14 @@ location YNH_WWW_PATH {
   try_files $uri $uri/ index.php;
   location ~ [^/]\.php(/|$) {
     fastcgi_split_path_info ^(.+?\.php)(/.*)$;
-    fastcgi_pass unix:/var/run/php5-fpm.sock;
-    
-    # Filename to be changed if dedicated php-fpm process is required
+    fastcgi_pass unix:/var/run/php5-fpm-__NAME__.sock;
+
+    # If you don't use a dedicated fpm config for your app,
+    # use a general fpm pool.
     # This is to be used INSTEAD of line above
     # Don't forget to adjust scripts install/upgrade/remove/backup accordingly
     #
-    #fastcgi_pass unix:/var/run/php5-fpm-YNH_WWW_APP.sock;
+    #fastcgi_pass unix:/var/run/php5-fpm.sock;
 
     fastcgi_index index.php;
     include fastcgi_params;
@@ -26,7 +31,7 @@ location YNH_WWW_PATH {
     fastcgi_param PATH_INFO $fastcgi_path_info;
     fastcgi_param SCRIPT_FILENAME $request_filename;
   }
-  # PHP configuration end
+  # PHP configuration end
 
   # Include SSOWAT user panel.
   include conf.d/yunohost_panel.conf.inc;