BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/320697
Change subject: Revert "tlsproxy: experimental support for internal ocsp" ...................................................................... Revert "tlsproxy: experimental support for internal ocsp" This reverts commit 146c0009ec771b64724f26b1dea0edb9fb8cd762. Bug: T93927 Change-Id: I207716e4deced1cd920ff36350bd389a946129d3 --- M hieradata/hosts/cp1008.yaml M modules/tlsproxy/manifests/localssl.pp M modules/tlsproxy/templates/localssl.erb 3 files changed, 0 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/97/320697/1 diff --git a/hieradata/hosts/cp1008.yaml b/hieradata/hosts/cp1008.yaml index c03cee7..afee624 100644 --- a/hieradata/hosts/cp1008.yaml +++ b/hieradata/hosts/cp1008.yaml @@ -8,4 +8,3 @@ - 'cp1008.wikimedia.org' codfw: - 'cp1008.wikimedia.org' -do_ocsp_int: true diff --git a/modules/tlsproxy/manifests/localssl.pp b/modules/tlsproxy/manifests/localssl.pp index 73cf7ff..ac6502c 100644 --- a/modules/tlsproxy/manifests/localssl.pp +++ b/modules/tlsproxy/manifests/localssl.pp @@ -85,7 +85,6 @@ } } - $do_ocsp_int = hiera('do_ocsp_int', false) if $do_ocsp { include tlsproxy::ocsp diff --git a/modules/tlsproxy/templates/localssl.erb b/modules/tlsproxy/templates/localssl.erb index 1d418d8..de35a95 100644 --- a/modules/tlsproxy/templates/localssl.erb +++ b/modules/tlsproxy/templates/localssl.erb @@ -32,12 +32,7 @@ <%- end -%> <%- if @do_ocsp -%> ssl_stapling on; - <%- if @do_ocsp_int -%> - resolver <%= @nameservers.join(' ') %>; - ssl_stapling_proxy http://webproxy.<%= @site %>.wmnet:8080/; - <%- else -%> ssl_stapling_file /var/cache/ocsp/<%= @name %>.ocsp; - <%- end -%> <%- end -%> keepalive_timeout 60; -- To view, visit https://gerrit.wikimedia.org/r/320697 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I207716e4deced1cd920ff36350bd389a946129d3 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack <bbl...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits