projects
/
chef.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0787978
)
Fix alias processing in mediawiki apache configuration
author
Tom Hughes
<tom@compton.nu>
Fri, 16 Feb 2018 12:40:12 +0000
(12:40 +0000)
committer
Tom Hughes
<tom@compton.nu>
Fri, 16 Feb 2018 12:40:12 +0000
(12:40 +0000)
cookbooks/mediawiki/templates/default/apache.erb
patch
|
blob
|
history
diff --git
a/cookbooks/mediawiki/templates/default/apache.erb
b/cookbooks/mediawiki/templates/default/apache.erb
index a4e0e48a4d5e5851ce9d36c915d36d9c692036de..913fc9acc52b8da27bcc28cfb2dabfbe892016be 100644
(file)
--- a/
cookbooks/mediawiki/templates/default/apache.erb
+++ b/
cookbooks/mediawiki/templates/default/apache.erb
@@
-19,6
+19,7
@@
ServerName <%= @name %>
<% @aliases.each do |alias_name| -%>
ServerAlias <%= alias_name %>
+<% end -%>
ServerAdmin webmaster@openstreetmap.org
@@
-28,7
+29,6
@@
CustomLog /var/log/apache2/<%= @name %>-secure-access.log combined
ErrorLog /var/log/apache2/<%= @name %>-secure-error.log
-<% end -%>
DocumentRoot <%= @directory %>