Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/126243
Change subject: toollabs: Setup ssl cert for tools.wmflabs.org ...................................................................... toollabs: Setup ssl cert for tools.wmflabs.org Change-Id: I092d55277c76c69c746057f713c2ee61f362dc59 --- M modules/dynamicproxy/templates/urlproxy.conf M modules/toollabs/manifests/proxy.pp 2 files changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/43/126243/1 diff --git a/modules/dynamicproxy/templates/urlproxy.conf b/modules/dynamicproxy/templates/urlproxy.conf index d33dcf1..1298d38 100644 --- a/modules/dynamicproxy/templates/urlproxy.conf +++ b/modules/dynamicproxy/templates/urlproxy.conf @@ -36,7 +36,7 @@ # Serve both HTTP and HTTPS listen 443 default_server ssl spdy; - ssl_certificate /etc/ssl/certs/<%= @ssl_certificate_name %>.chained.pem; + ssl_certificate /etc/ssl/certs/<%= @ssl_certificate_name %>.pem; ssl_certificate_key /etc/ssl/private/<%= @ssl_certificate_name %>.key; # Copied from templates/nginx/nginx.conf.erb. Eugh diff --git a/modules/toollabs/manifests/proxy.pp b/modules/toollabs/manifests/proxy.pp index 79e55e0..c6d9cc5 100644 --- a/modules/toollabs/manifests/proxy.pp +++ b/modules/toollabs/manifests/proxy.pp @@ -3,8 +3,9 @@ include toollabs::infrastructure class { '::dynamicproxy': - luahandler => 'urlproxy', - resolver => '10.68.16.1' # eqiad DNS resolver + luahandler => 'urlproxy', + resolver => '10.68.16.1', # eqiad DNS resolver + ssl_certificate_name => 'tools.wmflabs.org' } package { 'python-redis': -- To view, visit https://gerrit.wikimedia.org/r/126243 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I092d55277c76c69c746057f713c2ee61f362dc59 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yuvipanda <yuvipa...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits