Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/106767
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(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/67/106767/1 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: newchange Gerrit-Change-Id: I244c9b87ac0b1b7a2e8e6d72452008477a77d21e Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits