diff --git a/conf/nginx.conf b/conf/nginx.conf index 23632f2..726f976 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,31 +1,34 @@ #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; location __PATH__/ { + alias __FINALPATH__/ ; - # Path to source - alias __FINALPATH__/ ; + root /var/www/website/; + index index.html yellow.php; - client_max_body_size 100M; - autoindex off; + location __PATH__/cache { + rewrite ^(.*)$ /error break; + } - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } + location __PATH__/content { + rewrite ^(.*)$ /error break; + } - index index.html yellow.php; + location __PATH__/system { + rewrite ^(.*)$ /error break; + } - try_files $uri $uri/ index.php; - location ~ [^/]\.php(/|$) { - fastcgi_split_path_info ^(.+?\.php)(/.*)$; - fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; + location __PATH__/ { + if (!-e $request_filename) { + rewrite ^/(.*)$ /yellow.php last; + break; + } + } - fastcgi_index yellow.php; - include fastcgi_params; - fastcgi_param REMOTE_USER $remote_user; - fastcgi_param PATH_INFO $fastcgi_path_info; - fastcgi_param SCRIPT_FILENAME $request_filename; - } - - # Include SSOWAT user panel. - include conf.d/yunohost_panel.conf.inc; + try_files $uri $uri/ index.php; + location ~ [^/]\.php(/|$) { + fastcgi_split_path_info ^(.+?\.php)(/.*)$; + fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; + fastcgi_index yellow.php; + include fastcgi_params; + } } diff --git a/conf/nginx2.conf b/conf/nginx2.conf new file mode 100644 index 0000000..23632f2 --- /dev/null +++ b/conf/nginx2.conf @@ -0,0 +1,31 @@ +#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; +location __PATH__/ { + + # Path to source + alias __FINALPATH__/ ; + + client_max_body_size 100M; + autoindex off; + + # Force usage of https + if ($scheme = http) { + rewrite ^ https://$server_name$request_uri? permanent; + } + + index index.html yellow.php; + + try_files $uri $uri/ index.php; + location ~ [^/]\.php(/|$) { + fastcgi_split_path_info ^(.+?\.php)(/.*)$; + fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; + + fastcgi_index yellow.php; + include fastcgi_params; + fastcgi_param REMOTE_USER $remote_user; + fastcgi_param PATH_INFO $fastcgi_path_info; + fastcgi_param SCRIPT_FILENAME $request_filename; + } + + # Include SSOWAT user panel. + include conf.d/yunohost_panel.conf.inc; +} diff --git a/scripts/restore b/scripts/restore index 35aec7c..bd887ad 100644 --- a/scripts/restore +++ b/scripts/restore @@ -76,14 +76,6 @@ chmod -R a+rw $final_path ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" -#================================================= -# RESTORE SYSTEMD -#================================================= -ynh_script_progression --message="Restoring the systemd configuration..." --time --weight=1 - -ynh_restore_file --origin_path="/etc/systemd/system/$app.service" -systemctl enable $app.service - #================================================= # INTEGRATE SERVICE IN YUNOHOST #=================================================