From 3a6b9f54705751a00d5113aabdcf2fd059a3aeb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Szekeres=20Ba=CC=81lint?= <szekeres.balint@hps.hu>
Date: Tue, 23 Jan 2018 08:22:20 +0100
Subject: [PATCH] index block moved

---
 public/templates/_php.conf.html        |  4 ++--
 public/templates/example.com.conf.html | 10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/public/templates/_php.conf.html b/public/templates/_php.conf.html
index 5d7aab1..4ee09ee 100644
--- a/public/templates/_php.conf.html
+++ b/public/templates/_php.conf.html
@@ -1,7 +1,7 @@
-# index
+<span ng-if="data.file_structure === 'separated'"># index
 index {{ data.index_html ? 'index.html ' : '' }}index.php;
 
-# handle .php
+</span># handle .php
 location ~ \.php$ {<span ng-if="data.file_structure === 'separated'">
 	include _php_fastcgi.conf;
 	</span><span ng-if="data.file_structure === 'unified'">
diff --git a/public/templates/example.com.conf.html b/public/templates/example.com.conf.html
index b3b40c7..4289a7e 100644
--- a/public/templates/example.com.conf.html
+++ b/public/templates/example.com.conf.html
@@ -9,7 +9,10 @@
 
 	ssl_certificate /etc/letsencrypt/live/{{ data.domain }}/fullchain.pem;
 	ssl_certificate_key /etc/letsencrypt/live/{{ data.domain }}/privkey.pem;
-	ssl_trusted_certificate /etc/letsencrypt/live/{{ data.domain }}/fullchain.pem;<span ng-if="(data.php !== 'off' && data.index_php) || data.index_html">
+	ssl_trusted_certificate /etc/letsencrypt/live/{{ data.domain }}/fullchain.pem;<span ng-if="data.file_structure === 'unified' && data.php !== 'off'">
+
+	# index
+	index {{ data.index_html ? 'index.html ' : '' }}index.php;</span><span ng-if="(data.php !== 'off' && data.index_php) || data.index_html">
 
 	# $url{{ data.index_html ? ', index.html' : '' }}{{ data.php !== 'off' && data.index_php ? ', index.php' : '' }}
 	location / {
@@ -105,7 +108,10 @@ server {
 	server_name {{ !data.non_www ? 'www.' : '' }}{{ data.domain }};<span ng-if="data.php !== 'off'">
 	set $base /var/www/{{ data.domain }};
 	root $base{{ data.document_root }};</span><span ng-if="data.php === 'off'">
-	root /var/www/{{ data.domain }}{{ data.document_root }};</span><span ng-if="(data.php !== 'off' && data.index_php) || data.index_html">
+	root /var/www/{{ data.domain }}{{ data.document_root }};</span><span ng-if="data.file_structure === 'unified' && data.php !== 'off'">
+
+	# index
+	index {{ data.index_html ? 'index.html ' : '' }}index.php;</span><span ng-if="(data.php !== 'off' && data.index_php) || data.index_html">
 
 	# $url{{ data.index_html ? ', index.html' : '' }}{{ data.php !== 'off' && data.index_php ? ', index.php' : '' }}
 	location / {