From f1b3edfc31611126acde61e11167a892deaa2a04 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Mon, 18 Mar 2019 05:55:00 +0100 Subject: [PATCH] fix missing ; --- wo/cli/templates/virtualconf-php7.mustache | 6 +++--- wo/cli/templates/virtualconf.mustache | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/wo/cli/templates/virtualconf-php7.mustache b/wo/cli/templates/virtualconf-php7.mustache index 1e590de..1ca898d 100644 --- a/wo/cli/templates/virtualconf-php7.mustache +++ b/wo/cli/templates/virtualconf-php7.mustache @@ -6,7 +6,7 @@ server { # listen 80 default_server; {{/multisite}} - server_name {{^vma}}{{^rc}}{{site_name}}{{/rc}}{{/vma}} {{#vma}}vma.*{{/vma}} {{#rc}}webmail.*{{/rc}} {{^vma}}{{^rc}}{{#multisite}}*{{/multisite}}{{^multisite}}www{{/multisite}}.{{site_name}}{{/rc}}{{/vma}}; + server_name {{site_name}} {{#multisite}}*{{/multisite}}{{^multisite}}www{{/multisite}}.{{site_name}}; {{#multisite}} # Uncomment the following line for domain mapping @@ -28,7 +28,7 @@ server { {{/proxy}} {{^proxy}} - {{^vma}}{{^rc}}root {{webroot}}/htdocs;{{/rc}}{{/vma}} + root {{webroot}}/htdocs; {{^proxy}}index {{^static}}index.php{{/static}} index.html index.htm;{{/proxy}} @@ -42,6 +42,6 @@ server { {{#wpsubdir}}include common/wpsubdir.conf;{{/wpsubdir}}{{/static}} {{#wp}}include common/wpcommon-php73.conf;{{/wp}} {{^proxy}}include common/locations-php73.conf;{{/proxy}} - {{^vma}}{{^rc}}include {{webroot}}/conf/nginx/*.conf;{{/rc}}{{/vma}} + include {{webroot}}/conf/nginx/*.conf; {{/proxy}} } diff --git a/wo/cli/templates/virtualconf.mustache b/wo/cli/templates/virtualconf.mustache index 12d62e1..653a5aa 100644 --- a/wo/cli/templates/virtualconf.mustache +++ b/wo/cli/templates/virtualconf.mustache @@ -6,7 +6,7 @@ server { # listen 80 default_server; {{/multisite}} - server_name {{site_name}} {{#multisite}}*{{/multisite}}{{^multisite}}www{{/multisite}}.{{site_name}} + server_name {{site_name}} {{#multisite}}*{{/multisite}}{{^multisite}}www{{/multisite}}.{{site_name}}; {{#multisite}} # Uncomment the following line for domain mapping @@ -28,7 +28,7 @@ server { {{/proxy}} {{^proxy}} - {{^vma}}{{^rc}}root {{webroot}}/htdocs;{{/rc}}{{/vma}} + root {{webroot}}/htdocs; {{^proxy}}index {{^static}}index.php{{/static}} index.html index.htm;{{/proxy}} @@ -42,6 +42,6 @@ server { {{#wpsubdir}}include common/wpsubdir.conf;{{/wpsubdir}}{{/static}} {{#wp}}include common/wpcommon-php72.conf;{{/wp}} {{^proxy}}include common/locations-php72.conf;{{/proxy}} - {{^vma}}{{^rc}}include {{webroot}}/conf/nginx/*.conf;{{/rc}}{{/vma}} + include {{webroot}}/conf/nginx/*.conf; {{/proxy}} }