Commit 86dae593 authored by Hugo Hörnquist's avatar Hugo Hörnquist
Browse files

Downcase template variables.

parent 548433ac
......@@ -109,12 +109,12 @@ class datorhandbok {
require => Package['apache2'],
content => epp('datorhandbok/datorhandbok.lysator.liu.se',
{
# 'SSLCertificateFile' => '/etc/ssl/certs/datorhandbok.lysator.liu.se/datorhandbok.lysator.liu.se.pem',
# 'SSLCertificateKeyFile' => '/etc/ssl/certs/datorhandbok.lysator.liu.se/datorhandbok.lysator.liu.se.key',
# 'SSLCertificateChainFile' => '/etc/ssl/certs/DigiCertCA.crt',
'SSLCertificateFile' => "/etc/letsencrypt/live/${facts['networking']['fqdn']}/fullchain.pem",
'SSLCertificateKeyFile' => "/etc/letsencrypt/live/${facts['networking']['fqdn']}/privkey.pem",
'SSLCertificateChainFile' => "/etc/letsencrypt/live/${facts['networking']['fqdn']}/fullchain.pem",
# 'sslcertificatefile' => '/etc/ssl/certs/datorhandbok.lysator.liu.se/datorhandbok.lysator.liu.se.pem',
# 'sslcertificatekeyfile' => '/etc/ssl/certs/datorhandbok.lysator.liu.se/datorhandbok.lysator.liu.se.key',
# 'sslcertificatechainfile' => '/etc/ssl/certs/DigiCertCA.crt',
'sslcertificatefile' => "/etc/letsencrypt/live/${facts['networking']['fqdn']}/fullchain.pem",
'sslcertificatekeyfile' => "/etc/letsencrypt/live/${facts['networking']['fqdn']}/privkey.pem",
'sslcertificatechainfile' => "/etc/letsencrypt/live/${facts['networking']['fqdn']}/fullchain.pem",
}),
}
......
<%- |
String $SSLCertificateFile,
String $SSLCertificateKeyFile,
String $SSLCertificateChainFile,
String $sslcertificatefile,
String $sslcertificatekeyfile,
String $sslcertificatechainfile,
| -%>
<Directory /var/lib/mediawiki/>
Options +FollowSymLinks
......@@ -27,9 +27,9 @@
CustomLog /var/log/apache2/datorhandbok.lysator.liu.se.log combined
ErrorLog /var/log/apache2/datorhandbok.lysator.liu.se-error.log
SSLCertificateFile <%= $SSLCertificateFile %>
SSLCertificateKeyFile <%= $SSLCertificateKeyFile %>
SSLCertificateChainFile <%= $SSLCertificateChainFile %>
SSLCertificateFile <%= $sslcertificatefile %>
SSLCertificateKeyFile <%= $sslcertificatekeyfile %>
SSLCertificateChainFile <%= $sslcertificatechainfile %>
SSLProtocol all -SSLv2 -SSLv3
SSLCompression off
SSLHonorCipherOrder on
......
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