diff options
| author | Micah Anderson <micah@riseup.net> | 2013-04-17 16:07:55 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-04-17 16:07:55 -0400 |
| commit | 6844258b567b5065f5488a12f3f18208ff36ecb0 (patch) | |
| tree | 57dc2fd942ca81584f85ea7f25ec77a6b845f88e /files/vhosts.d/CentOS/0-default_ssl.conf | |
| parent | dafb060fc57957dbe9e5e90698537e781cebeaf6 (diff) | |
| parent | 2f6d7891e115f921c157567e2aa5afd6199c310e (diff) | |
Merge remote-tracking branch 'shared/master' into leap
Conflicts:
manifests/debian.pp
Diffstat (limited to 'files/vhosts.d/CentOS/0-default_ssl.conf')
| -rw-r--r-- | files/vhosts.d/CentOS/0-default_ssl.conf | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/files/vhosts.d/CentOS/0-default_ssl.conf b/files/vhosts.d/CentOS/0-default_ssl.conf index 9f8c4b6..d018bcc 100644 --- a/files/vhosts.d/CentOS/0-default_ssl.conf +++ b/files/vhosts.d/CentOS/0-default_ssl.conf @@ -8,6 +8,12 @@ Include include.d/ssl_defaults.inc DocumentRoot /var/www/html + # Use separate log files for the SSL virtual host; note that LogLevel + # is not inherited from httpd.conf. + ErrorLog logs/ssl_error_log + TransferLog logs/ssl_access_log + LogLevel warn + SSLCertificateFile /etc/pki/tls/certs/localhost.crt SSLCertificateKeyFile /etc/pki/tls/private/localhost.key </VirtualHost> |