diff --git a/conf/nginx.conf b/conf/nginx.conf index be2d9fb..96c88f4 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,23 +1,34 @@ -location YNH_WWW_PATH/ { - alias YNH_WWW_ALIAS; +location __PATH__ { + # Path to source + alias __FINALPATH__/ - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; + if ($scheme = http) { + rewrite ^ https://$server_name$request_uri? permanent; + } + + # Example PHP configuration (remove if not used) + index index.php; + + try_files $uri $uri/ index.php; + location ~ [^/]\.php(/|$) { + fastcgi_split_path_info ^(.+?\.php)(/.*)$; + 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.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 - index index.php; - try_files $uri $uri/ index.php; - - location ~ [^/]\.php(/|$) { - fastcgi_split_path_info ^(.+?\.php)(/.*)$; - 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; - } - - # show YunoHost panel access - include conf.d/yunohost_panel.conf.inc; + # Include SSOWAT user panel. + include conf.d/yunohost_panel.conf.inc; } diff --git a/conf/nginx.conf.old b/conf/nginx.conf.old new file mode 100644 index 0000000..be2d9fb --- /dev/null +++ b/conf/nginx.conf.old @@ -0,0 +1,23 @@ +location YNH_WWW_PATH/ { + alias YNH_WWW_ALIAS; + + if ($scheme = http) { + rewrite ^ https://$server_name$request_uri? permanent; + } + + index index.php; + try_files $uri $uri/ index.php; + + location ~ [^/]\.php(/|$) { + fastcgi_split_path_info ^(.+?\.php)(/.*)$; + 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; + } + + # show YunoHost panel access + include conf.d/yunohost_panel.conf.inc; +} diff --git a/scripts/install b/scripts/install index 6ecea88..dd1b331 100644 --- a/scripts/install +++ b/scripts/install @@ -99,9 +99,9 @@ ynh_webpath_register $app $domain $path_url # 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/htdocs/@g" $nginx_conf - sed -i "s@YNH_WWW_APP@$app@g" $nginx_conf + sed -i "s@__PATH__@${path_url}@g" $nginx_conf + sed -i "s@__FINALPATH__@$src_path/htdocs/@g" $nginx_conf + sed -i "s@__NAME__@$app@g" $nginx_conf sudo cp $nginx_conf /etc/nginx/conf.d/$domain.d/$app.conf # PHP