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

Get rid of yunohost.local in main domain nginx conf ... because this interfer with using yunohost.local for postinstall. Just let it be handled by the default vhost

Browse source
This commit is contained in:
Alexandre Aubin 2020-10-03 16:32:28 +02:00
parent 14644f0567
commit ba884d5b6d
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/hooks/conf_regen/15-nginx
View file

@ -73,9 +73,7 @@ do_pre_regen() {
ynh_render_template "server.tpl.conf" "${nginx_conf_dir}/${domain}.conf"
ynh_render_template "autoconfig.tpl.xml" "${mail_autoconfig_dir}/config-v1.1.xml"
[[ $main_domain != $domain ]] \
&& touch "${domain_conf_dir}/yunohost_local.conf" \
|| cp yunohost_local.conf "${domain_conf_dir}/yunohost_local.conf"
touch "${domain_conf_dir}/yunohost_local.conf" # Clean legacy conf files
done

1
data/templates/nginx/yunohost_local.conf
View file

@ -1 +0,0 @@
server_name $server_name yunohost.local;