Uses doc_root parameter now
This commit is contained in:
parent
c7d6bc710a
commit
c826f0a139
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# Managed by CFEengine
|
||||
#
|
||||
<Directory {{vars.apache.www_dir}}/{{vars.apache_vhost.site.domain}}>
|
||||
<Directory {{vars.apache_vhost.site.doc_root}}>
|
||||
AllowOverride all
|
||||
Options Indexes FollowSymLinks
|
||||
Require all granted
|
||||
|
@ -17,7 +17,7 @@
|
|||
RewriteEngine On
|
||||
Alias /.well-known/acme-challenge/ "{{vars.apache.default_html_dir}}/.well-known/acme-challenge/"
|
||||
RewriteRule "^/.well-known/acme-challenge/" - [L]
|
||||
DocumentRoot "{{vars.apache.www_dir}}/{{vars.apache_vhost.site.domain}}"
|
||||
DocumentRoot "{{vars.apache_vhost.site.doc_root}}"
|
||||
ServerAlias {{#vars.apache_vhost.site.aliases}}{{.}} {{/vars.apache_vhost.site.aliases}}
|
||||
ErrorLog "{{vars.apache.log_dir}}/{{vars.apache_vhost.site.domain}}-error.log"
|
||||
CustomLog "{{vars.apache.log_dir}}/{{vars.apache_vhost.site.domain}}-access.log" combined
|
||||
|
@ -32,12 +32,12 @@
|
|||
RewriteEngine On
|
||||
Alias /.well-known/acme-challenge/ "{{vars.apache.default_html_dir}}/.well-known/acme-challenge/"
|
||||
RewriteRule "^/.well-known/acme-challenge/" - [L]
|
||||
DocumentRoot "{{vars.apache.www_dir}}/{{vars.apache_vhost.site.domain}}"
|
||||
DocumentRoot "{{vars.apache_vhost.site.doc_root}}"
|
||||
Redirect permanent / https://{{vars.apache_vhost.site.domain}}/
|
||||
</VirtualHost>
|
||||
<VirtualHost *:443>
|
||||
ServerAdmin {{vars.apache_vhost.site.email}}
|
||||
DocumentRoot "{{vars.apache.www_dir}}/{{vars.apache_vhost.site.domain}}"
|
||||
DocumentRoot "{{vars.apache_vhost.site.doc_root}}"
|
||||
ServerName {{vars.apache_vhost.site.domain}}
|
||||
ServerAlias {{#vars.apache_vhost.site.aliases}}{{.}} {{/vars.apache_vhost.site.aliases}}
|
||||
ErrorLog "{{vars.apache.log_dir}}/{{vars.apache_vhost.site.domain}}-error.log"
|
||||
|
|
Loading…
Reference in New Issue