summaryrefslogtreecommitdiff
path: root/puppet/modules/site_apache/templates/vhosts.d/common.conf.erb
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-09-25 11:22:34 +0200
committervarac <varacanero@zeromail.org>2014-09-25 11:22:34 +0200
commit6b28dd3a0725fa336bb1a4b08471811604601d0f (patch)
tree073f8de7c9c9cc1a5884c616093b3b18ed53ba7a /puppet/modules/site_apache/templates/vhosts.d/common.conf.erb
parentaf606967d39227390f5ef8403c64d693c1dfd76d (diff)
parent308ac3cb420cbce7a6c67e03e887db4723aa8169 (diff)
Merge branch '6138_fix_rsyslog-gnutls_install' into develop
Diffstat (limited to 'puppet/modules/site_apache/templates/vhosts.d/common.conf.erb')
-rw-r--r--puppet/modules/site_apache/templates/vhosts.d/common.conf.erb2
1 files changed, 2 insertions, 0 deletions
diff --git a/puppet/modules/site_apache/templates/vhosts.d/common.conf.erb b/puppet/modules/site_apache/templates/vhosts.d/common.conf.erb
index ed430510..0e08529c 100644
--- a/puppet/modules/site_apache/templates/vhosts.d/common.conf.erb
+++ b/puppet/modules/site_apache/templates/vhosts.d/common.conf.erb
@@ -3,12 +3,14 @@
ServerAlias www.<%= domain %>
RewriteEngine On
RewriteRule ^.*$ https://<%= domain -%>%{REQUEST_URI} [R=permanent,L]
+ CustomLog ${APACHE_LOG_DIR}/other_vhosts_access.log common
</VirtualHost>
<VirtualHost *:443>
ServerName <%= domain_name %>
ServerAlias <%= domain %>
ServerAlias www.<%= domain %>
+ CustomLog ${APACHE_LOG_DIR}/other_vhosts_access.log common
SSLEngine on
SSLProtocol all -SSLv2