YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix from comment PR #462

Browse source
This commit is contained in:
Josué Tille 2018-05-12 21:31:12 +02:00
parent 0f8cef9cf8
commit 82b598b5ca
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
data/helpers.d/backend
View file

@ -134,7 +134,7 @@ ynh_remove_systemd_config () {
# __PORT_2__ by $port_2 # __PORT_2__ by $port_2
# #
ynh_add_nginx_config () { ynh_add_nginx_config () {
local finalnginxconf="/etc/nginx/conf.d/$domain.d/$app.conf" finalnginxconf="/etc/nginx/conf.d/$domain.d/$app.conf"
local others_var=${1:-} local others_var=${1:-}
ynh_backup_if_checksum_is_different "$finalnginxconf" ynh_backup_if_checksum_is_different "$finalnginxconf"
sudo cp ../conf/nginx.conf "$finalnginxconf" sudo cp ../conf/nginx.conf "$finalnginxconf"
@ -161,14 +161,18 @@ ynh_add_nginx_config () {
fi fi
# Replace all other variable given as arguments # Replace all other variable given as arguments
for v in $others_var for var_to_replace in $others_var
do do
ynh_replace_string "__${v^^}__" "${!v}" "$finalnginxconf" # ${var_to_replace^^} make the content of the variable on upper-cases
# ${!var_to_replace} get the content of the variable named $var_to_replace
ynh_replace_string "__${var_to_replace^^}__" "${!var_to_replace}" "$finalnginxconf"
done done
if [ "${path_url:-}" != "/" ] if [ "${path_url:-}" != "/" ]
then then
ynh_replace_string "^#sub_path_only" "" "$finalnginxconf" ynh_replace_string "^#sub_path_only" "" "$finalnginxconf"
else
ynh_replace_string "^#root_path_only" "" "$finalnginxconf"
fi fi
ynh_store_file_checksum "$finalnginxconf" ynh_store_file_checksum "$finalnginxconf"