Faidon Liambotis has submitted this change and it was merged.
Change subject: webserver::apache::site: fix syntax error
......................................................................
webserver::apache::site: fix syntax error
"Cannot reassign variable certfile"
Change-Id: I244c9b87ac0b1b7a2e8e6d72452008477a77d21e
---
M manifests/webserver.pp
1 file changed, 2 insertions(+), 10 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/webserver.pp b/manifests/webserver.pp
index ce2d674..7f49b7d 100644
--- a/manifests/webserver.pp
+++ b/manifests/webserver.pp
@@ -299,8 +299,8 @@
define site(
$aliases=[],
$ssl="false",
- $certfile=undef,
- $certkey=undef,
+ $certfile="/etc/ssl/certs/${title}.pem",
+ $certkey="/etc/ssl/private/${title}.key",
$docroot=undef,
$custom=[],
$includes=[],
@@ -314,14 +314,6 @@
if "$ssl" in ["true", "only", "redirected"] {
webserver::apache::module { ssl: }
-
- # If no cert files are defined, assume a named
certificate for the domain
- if ! $certfile {
- $certfile = "/etc/ssl/certs/${title}.pem"
- }
- if ! $certkey {
- $certkey = "/etc/ssl/private/${title}.key"
- }
}
file {
--
To view, visit https://gerrit.wikimedia.org/r/106767
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I244c9b87ac0b1b7a2e8e6d72452008477a77d21e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
