diff --git a/conf/nginx.conf b/conf/nginx.conf index e934ffe..87ee77e 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,22 +1,22 @@ location ^~ YNH_WWW_PATH { - root /var/www; - try_files $uri $uri/ /YNH_WWW_APP/index.php?$query_string; - index /YNH_WWW_APP/index.php; + alias YNH_WWW_FINALPATH/ ; + try_files $uri $uri/ /YNH_WWW_ROOTAPP/index.php?$query_string; + index /YNH_WWW_ROOTAPP/index.php; - location YNH_WWW_PATH/ { try_files $uri $uri/ /YNH_WWW_APP/index.php?$query_string; } - location YNH_WWW_PATH/api { try_files $uri $uri/ /YNH_WWW_APP/api.php?$query_string; } - location YNH_WWW_PATH/admin { try_files $uri $uri/ /YNH_WWW_APP/admin.php?$query_string; } + location YNH_WWW_ROOTPATH/ { try_files $uri $uri/ /YNH_WWW_ROOTAPP/index.php?$query_string; } + location YNH_WWW_ROOTPATH/api { try_files $uri $uri/ /YNH_WWW_ROOTAPP/api.php?$query_string; } + location YNH_WWW_ROOTPATH/admin { try_files $uri $uri/ /YNH_WWW_ROOTAPP/admin.php?$query_string; } - location YNH_WWW_PATH/flarum { + location YNH_WWW_ROOTPATH/flarum { deny all; return 404; } location ~* \.php$ { fastcgi_split_path_info ^(.+.php)(/.+)$; - fastcgi_pass unix:/var/run/php5-fpm-YNH_WWW_APP.sock; + fastcgi_pass unix:/var/run/php5-fpm-YNH_WWW_ROOTAPP.sock; include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param SCRIPT_FILENAME $request_filename; fastcgi_param HTTP_PROXY ""; # Fix for https://httpoxy.org/ vulnerability fastcgi_index index.php; fastcgi_read_timeout 600; diff --git a/conf/nginx_root.conf b/conf/nginx_root.conf deleted file mode 100644 index 23411f6..0000000 --- a/conf/nginx_root.conf +++ /dev/null @@ -1,60 +0,0 @@ -root /var/www/YNH_WWW_APP; -location ^~ / { - try_files $uri $uri/ /index.php?$query_string; - index /index.php; - - location / { try_files $uri $uri/ /index.php?$query_string; } - location /api { try_files $uri $uri/ /api.php?$query_string; } - location /admin { try_files $uri $uri/ /admin.php?$query_string; } - - location /flarum { - deny all; - return 404; - } - - location ~* \.php$ { - fastcgi_split_path_info ^(.+.php)(/.+)$; - fastcgi_pass unix:/var/run/php5-fpm-YNH_WWW_APP.sock; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param HTTP_PROXY ""; # Fix for https://httpoxy.org/ vulnerability - fastcgi_index index.php; - fastcgi_read_timeout 600; - } - - location ~* \.html$ { - expires -1; - } - - location ~* \.(css|js|gif|jpe?g|png)$ { - expires 1M; - add_header Pragma public; - add_header Cache-Control "public, must-revalidate, proxy-revalidate"; - } - - gzip on; - gzip_http_version 1.1; - gzip_vary on; - gzip_comp_level 6; - gzip_proxied any; - gzip_types application/atom+xml - application/javascript - application/json - application/vnd.ms-fontobject - application/x-font-ttf - application/x-web-app-manifest+json - application/xhtml+xml - application/xml - font/opentype - image/svg+xml - image/x-icon - text/css - text/plain - text/xml; - gzip_buffers 16 8k; - gzip_disable "MSIE [1-6]\.(?!.*SV1)"; - - - # Include SSOWAT user panel. - # include conf.d/yunohost_panel.conf.inc; -} diff --git a/scripts/install b/scripts/install index 7810ea3..b676320 100644 --- a/scripts/install +++ b/scripts/install @@ -105,15 +105,17 @@ ynh_app_setting_set "$app" mysqlpwd "$dbpass" ynh_mysql_create_db "$dbname" "$dbuser" "$dbpass" ### Nginx ### +nginxconf="../conf/nginx.conf" if [ $path = "/" ]; then -nginx_conf=../conf/nginx_root.conf + sed -i "s@YNH_WWW_ROOTPATH@@g" ../conf/nginx.conf + sed -i "s@/YNH_WWW_ROOTAPP@@g" ../conf/nginx.conf else -nginx_conf=../conf/nginx.conf + sed -i "s@YNH_WWW_ROOTPATH@$path@g" ../conf/nginx.conf + sed -i "s@YNH_WWW_ROOTAPP@$app@g" ../conf/nginx.conf fi -sed -i "s@YNH_WWW_PATH@$path@g" $nginx_conf -sed -i "s@YNH_WWW_ALIAS@$app/@g" $nginx_conf -sed -i "s@YNH_WWW_APP@$app@g" $nginx_conf -sudo cp $nginx_conf /etc/nginx/conf.d/$domain.d/$app.conf +sed -i "s@YNH_WWW_PATH@$path@g" $nginxconf +sed -i "s@YNH_WWW_FINALPATH@$final_path@g" $nginxconf +sudo cp $nginxconf /etc/nginx/conf.d/$domain.d/$app.conf ### PHP ### sed -i "s@YNH_WWW_APP@$app@g" ../conf/php-fpm.conf