YunoHost-Apps/dolibarr_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/dolibarr_ynh.git synced 2024-09-03 18:35:53 +02:00
Code Issues Activity Actions

Updated nginx.conf and nginx sed

Browse source
This commit is contained in:
Olivier BILHAUT 2018-01-29 15:40:14 +01:00 committed by Jeff
parent 6b5d40b3ac
commit 80ac19332e
3 changed files with 56 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
conf/nginx.conf
View file

@ -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;
}

23
conf/nginx.conf.old Normal file
View file

@ -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;
}

6
scripts/install
View file

@ -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