Commit eeba8d63 authored by Paul Cammish's avatar Paul Cammish
Browse files

Fix incorrect markup and apply Apache bug workaround

parent 19d4bd98
......@@ -4,7 +4,7 @@
# /etc/sympl/apache.d/ssl.template.erb.
#
# Any extra Apache configurations can be added as .conf files in
# /srv/<% domain %>/config/apache.d/
# /srv/<%= domain %>/config/apache.d/
# which will be read after the base configuration has been read.
# Warning: Ensure these are valid, as you may break Apache!
#
......@@ -120,9 +120,9 @@
ErrorLog "<%= domain.log_dir %>/ssl_error.log"
CustomLog "<%= domain.log_dir %>/ssl_access.log" combined
# Read the directory /srv/<% domain %>/config/apache.d for any other Apache
# Read the directory /srv/<%= domain %>/config/apache.d for any other Apache
# configuration files.
IncludeOptional /srv/<% domain %>/config/apache.d/*.conf
IncludeOptional /srv/<%= domain %>/config/apache.d*/*.conf
# Ensure these are valid as they will break Apache if they are incorrect!
</VirtualHost>
......@@ -224,9 +224,9 @@
ErrorLog "<%= domain.log_dir %>/error.log"
CustomLog "<%= domain.log_dir %>/access.log" combined
# Read the directory /srv/<% domain %>/config/apache.d for any other Apache
# Read the directory /srv/<%= domain %>/config/apache.d for any other Apache
# configuration files.
IncludeOptional /srv/<% domain %>/config/apache.d/*.conf
IncludeOptional /srv/<%= domain %>/config/apache.d*/*.conf
# Ensure these are valid as they will break Apache if they are incorrect!
</VirtualHost>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment