YunoHost-Apps/yellow_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/yellow_ynh.git synced 2024-09-03 20:36:12 +02:00
Code Issues Activity Actions

fix

Browse source
This commit is contained in:
ericgaspar 2020-11-01 22:56:40 +01:00
parent 6d943ae7c5
commit 67027cd68c
No known key found for this signature in database
GPG key ID: 574F281483054D44
3 changed files with 56 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
conf/nginx.conf
View file

@ -1,31 +1,34 @@
#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
location __PATH__/ { location __PATH__/ {
alias __FINALPATH__/ ;
# Path to source root /var/www/website/;
alias __FINALPATH__/ ; index index.html yellow.php;
client_max_body_size 100M; location __PATH__/cache {
autoindex off; rewrite ^(.*)$ /error break;
}
# Force usage of https location __PATH__/content {
if ($scheme = http) { rewrite ^(.*)$ /error break;
rewrite ^ https://$server_name$request_uri? permanent; }
}
index index.html yellow.php; location __PATH__/system {
rewrite ^(.*)$ /error break;
}
try_files $uri $uri/ index.php; location __PATH__/ {
location ~ [^/]\.php(/|$) { if (!-e $request_filename) {
fastcgi_split_path_info ^(.+?\.php)(/.*)$; rewrite ^/(.*)$ /yellow.php last;
fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; break;
}
}
fastcgi_index yellow.php; try_files $uri $uri/ index.php;
include fastcgi_params; location ~ [^/]\.php(/|$) {
fastcgi_param REMOTE_USER $remote_user; fastcgi_split_path_info ^(.+?\.php)(/.*)$;
fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock;
fastcgi_param SCRIPT_FILENAME $request_filename; fastcgi_index yellow.php;
} include fastcgi_params;
}
# Include SSOWAT user panel.
include conf.d/yunohost_panel.conf.inc;
} }

31
conf/nginx2.conf Normal file
View file

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

8
scripts/restore
View file

@ -76,14 +76,6 @@ chmod -R a+rw $final_path
ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" 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 # INTEGRATE SERVICE IN YUNOHOST
#================================================= #=================================================