From a5bba7624462170b155007e7c80a00f6b68480e0 Mon Sep 17 00:00:00 2001 From: kam Date: Wed, 28 Jun 2017 16:54:03 +0200 Subject: [PATCH] fix --- conf/nginx.conf | 35 ++++++----------------------------- scripts/install | 2 +- 2 files changed, 7 insertions(+), 30 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 8c76342..b4e5fd9 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,33 +1,10 @@ location YNH_WWW_PATH { - # Path to source - alias YNH_WWW_ALIAS ; + proxy_pass http://localhost:PORT; + proxy_set_header Host $host; + proxy_set_header X-Forwarded-Ssl on; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - # Example PHP configuration (remove if not used) - index index.php; - - # Common parameter to increase upload size limit in conjuction with dedicated php-fpm file - #client_max_body_size 50M; - - 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 - # 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_index index.php; - include fastcgi_params; - fastcgi_param REMOTE_USER $remote_user; - fastcgi_param PATH_INFO $fastcgi_path_info; - fastcgi_param SCRIPT_FILENAME $request_filename; - } - # PHP configuration end - - # Include SSOWAT user panel. - include conf.d/yunohost_panel.conf.inc; + include conf.d/yunohost_panel.conf.inc; + proxy_set_header Accept-Encoding ""; } diff --git a/scripts/install b/scripts/install index e4979fd..f8ce0e1 100644 --- a/scripts/install +++ b/scripts/install @@ -74,7 +74,7 @@ sudo gitlab-ctl reconfigure # Modify Nginx configuration file and copy it to Nginx conf directory nginx_conf=../conf/nginx.conf sed -i "s@YNH_WWW_PATH@$path_url@g" $nginx_conf -sed -i "s@YNH_WWW_ALIAS@$src_path/@g" $nginx_conf +# sed -i "s@YNH_WWW_ALIAS@$src_path/@g" $nginx_conf # If a dedicated php-fpm process is used: # Don't forget to modify ../conf/nginx.conf accordingly or your app will not work! # sed -i "s@YNH_WWW_APP@$app@g" $nginx_conf