index block moved

pull/12/head
Szekeres Bálint 2018-01-23 08:22:20 +01:00
parent 5f7ce069c2
commit 3a6b9f5470
2 changed files with 10 additions and 4 deletions

View File

@ -1,7 +1,7 @@
# index <span ng-if="data.file_structure === 'separated'"># index
index {{ data.index_html ? 'index.html ' : '' }}index.php; index {{ data.index_html ? 'index.html ' : '' }}index.php;
# handle .php </span># handle .php
location ~ \.php$ {<span ng-if="data.file_structure === 'separated'"> location ~ \.php$ {<span ng-if="data.file_structure === 'separated'">
include _php_fastcgi.conf; include _php_fastcgi.conf;
</span><span ng-if="data.file_structure === 'unified'"> </span><span ng-if="data.file_structure === 'unified'">

View File

@ -9,7 +9,10 @@
ssl_certificate /etc/letsencrypt/live/{{ data.domain }}/fullchain.pem; ssl_certificate /etc/letsencrypt/live/{{ data.domain }}/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/{{ data.domain }}/privkey.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' : '' }} # $url{{ data.index_html ? ', index.html' : '' }}{{ data.php !== 'off' && data.index_php ? ', index.php' : '' }}
location / { location / {
@ -105,7 +108,10 @@ server {
server_name {{ !data.non_www ? 'www.' : '' }}{{ data.domain }};<span ng-if="data.php !== 'off'"> server_name {{ !data.non_www ? 'www.' : '' }}{{ data.domain }};<span ng-if="data.php !== 'off'">
set $base /var/www/{{ data.domain }}; set $base /var/www/{{ data.domain }};
root $base{{ data.document_root }};</span><span ng-if="data.php === 'off'"> 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' : '' }} # $url{{ data.index_html ? ', index.html' : '' }}{{ data.php !== 'off' && data.index_php ? ', index.php' : '' }}
location / { location / {