From c826f0a1394837f8a8c90fe99b6071430c766829 Mon Sep 17 00:00:00 2001 From: Tobias Herre Date: Sun, 8 Oct 2023 00:36:00 +0200 Subject: [PATCH] Uses doc_root parameter now --- templates/httpd-vhost.conf.mustache | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/httpd-vhost.conf.mustache b/templates/httpd-vhost.conf.mustache index 92b2cd4..96bac09 100644 --- a/templates/httpd-vhost.conf.mustache +++ b/templates/httpd-vhost.conf.mustache @@ -1,7 +1,7 @@ # # Managed by CFEengine # - + 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}}/ 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"