Filippo Giunchedi has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/345615 )
Change subject: Revert "Make Thumbor connect to Swift via https" ...................................................................... Revert "Make Thumbor connect to Swift via https" This reverts commit 419500d6aff4e538335708571dea71f55aa40b0a. Change-Id: I62ba535e40dee1772b5b84793cb0ce03b1182eaf --- M modules/thumbor/manifests/swift.pp 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved diff --git a/modules/thumbor/manifests/swift.pp b/modules/thumbor/manifests/swift.pp index 2dfc2c1..eb2b16e 100644 --- a/modules/thumbor/manifests/swift.pp +++ b/modules/thumbor/manifests/swift.pp @@ -10,7 +10,7 @@ # $swift_account = 'thumbor', # $swift_user = 'thumbor', # $swift_sharded_containers = [], -# $swift_host = "https://ms-fe.svc.${::site}.wmnet";, +# $swift_host = "http://ms-fe.svc.${::site}.wmnet";, # # === Examples # @@ -23,7 +23,7 @@ $swift_account = 'mw', $swift_user = 'thumbor', $swift_sharded_containers = [], - $swift_host = "https://ms-fe.svc.${::site}.wmnet";, + $swift_host = "http://ms-fe.svc.${::site}.wmnet";, ) { file { '/etc/thumbor.d/80-thumbor-swift.conf': ensure => present, -- To view, visit https://gerrit.wikimedia.org/r/345615 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I62ba535e40dee1772b5b84793cb0ce03b1182eaf Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Gilles <[email protected]> Gerrit-Reviewer: Filippo Giunchedi <[email protected]> Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
