WMDE
/
wmdeit-cf-wmdelib
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Uses doc_root parameter now

This commit is contained in:
Tobias Herre 2023-10-08 00:36:00 +02:00
parent c7d6bc710a
commit c826f0a139
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
templates/httpd-vhost.conf.mustache
View File

@ -1,7 +1,7 @@
# #
# Managed by CFEengine # Managed by CFEengine
# #
<Directory {{vars.apache.www_dir}}/{{vars.apache_vhost.site.domain}}> <Directory {{vars.apache_vhost.site.doc_root}}>
AllowOverride all AllowOverride all
Options Indexes FollowSymLinks Options Indexes FollowSymLinks
Require all granted Require all granted
@ -17,7 +17,7 @@
RewriteEngine On RewriteEngine On
Alias /.well-known/acme-challenge/ "{{vars.apache.default_html_dir}}/.well-known/acme-challenge/" Alias /.well-known/acme-challenge/ "{{vars.apache.default_html_dir}}/.well-known/acme-challenge/"
RewriteRule "^/.well-known/acme-challenge/" - [L] 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}} ServerAlias {{#vars.apache_vhost.site.aliases}}{{.}} {{/vars.apache_vhost.site.aliases}}
ErrorLog "{{vars.apache.log_dir}}/{{vars.apache_vhost.site.domain}}-error.log" 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 CustomLog "{{vars.apache.log_dir}}/{{vars.apache_vhost.site.domain}}-access.log" combined
@ -32,12 +32,12 @@
RewriteEngine On RewriteEngine On
Alias /.well-known/acme-challenge/ "{{vars.apache.default_html_dir}}/.well-known/acme-challenge/" Alias /.well-known/acme-challenge/ "{{vars.apache.default_html_dir}}/.well-known/acme-challenge/"
RewriteRule "^/.well-known/acme-challenge/" - [L] 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}}/ Redirect permanent / https://{{vars.apache_vhost.site.domain}}/
</VirtualHost> </VirtualHost>
<VirtualHost *:443> <VirtualHost *:443>
ServerAdmin {{vars.apache_vhost.site.email}} 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}} ServerName {{vars.apache_vhost.site.domain}}
ServerAlias {{#vars.apache_vhost.site.aliases}}{{.}} {{/vars.apache_vhost.site.aliases}} ServerAlias {{#vars.apache_vhost.site.aliases}}{{.}} {{/vars.apache_vhost.site.aliases}}
ErrorLog "{{vars.apache.log_dir}}/{{vars.apache_vhost.site.domain}}-error.log" ErrorLog "{{vars.apache.log_dir}}/{{vars.apache_vhost.site.domain}}-error.log"