Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Lysator
Puppet
Datorhandbok
Commits
86dae593
Commit
86dae593
authored
Jan 31, 2021
by
Hugo Hörnquist
Browse files
Downcase template variables.
parent
548433ac
Changes
2
Hide whitespace changes
Inline
Side-by-side
manifests/init.pp
View file @
86dae593
...
...
@@ -109,12 +109,12 @@ class datorhandbok {
require => Package['apache2'],
content => epp('datorhandbok/datorhandbok.lysator.liu.se',
{
# '
SSLC
ertificate
F
ile' => '/etc/ssl/certs/datorhandbok.lysator.liu.se/datorhandbok.lysator.liu.se.pem',
# '
SSLC
ertificate
K
ey
F
ile' => '/etc/ssl/certs/datorhandbok.lysator.liu.se/datorhandbok.lysator.liu.se.key',
# '
SSLC
ertificate
C
hain
F
ile' => '/etc/ssl/certs/DigiCertCA.crt',
'
SSLC
ertificate
F
ile' => "/etc/letsencrypt/live/${facts['networking']['fqdn']}
/
fullchain
.
pem
"
,
'
SSLC
ertificate
K
ey
F
ile'
=>
"
/
etc
/
letsencrypt
/
live
/$
{facts['networking']['fqdn']}
/
privkey
.
pem
"
,
'
SSLC
ertificate
C
hain
F
ile'
=>
"
/
etc
/
letsencrypt
/
live
/$
{facts['networking']['fqdn']}
/
fullchain
.
pem
"
,
# '
sslc
ertificate
f
ile' => '/etc/ssl/certs/datorhandbok.lysator.liu.se/datorhandbok.lysator.liu.se.pem',
# '
sslc
ertificate
k
ey
f
ile' => '/etc/ssl/certs/datorhandbok.lysator.liu.se/datorhandbok.lysator.liu.se.key',
# '
sslc
ertificate
c
hain
f
ile' => '/etc/ssl/certs/DigiCertCA.crt',
'
sslc
ertificate
f
ile' => "/etc/letsencrypt/live/${facts['networking']['fqdn']}
/
fullchain
.
pem
"
,
'
sslc
ertificate
k
ey
f
ile'
=>
"
/
etc
/
letsencrypt
/
live
/$
{facts['networking']['fqdn']}
/
privkey
.
pem
"
,
'
sslc
ertificate
c
hain
f
ile'
=>
"
/
etc
/
letsencrypt
/
live
/$
{facts['networking']['fqdn']}
/
fullchain
.
pem
"
,
}),
}
...
...
templates/datorhandbok.lysator.liu.se.epp
View file @
86dae593
<%- |
String
$
SSLC
ertificate
F
ile
,
String
$
SSLC
ertificate
K
ey
F
ile
,
String
$
SSLC
ertificate
C
hain
F
ile
,
String
$
sslc
ertificate
f
ile
,
String
$
sslc
ertificate
k
ey
f
ile
,
String
$
sslc
ertificate
c
hain
f
ile
,
| -%>
<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
<%=
$
SSLC
ertificate
F
ile
%>
SSLCertificateKeyFile
<%=
$
SSLC
ertificate
K
ey
F
ile
%>
SSLCertificateChainFile
<%=
$
SSLC
ertificate
C
hain
F
ile
%>
SSLCertificateFile
<%=
$
sslc
ertificate
f
ile
%>
SSLCertificateKeyFile
<%=
$
sslc
ertificate
k
ey
f
ile
%>
SSLCertificateChainFile
<%=
$
sslc
ertificate
c
hain
f
ile
%>
SSLProtocol all -SSLv2 -SSLv3
SSLCompression off
SSLHonorCipherOrder on
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment