Ottomata has submitted this change and it was merged. Change subject: Not writing out :80 in redirect urls ......................................................................
Not writing out :80 in redirect urls Change-Id: I4faf39ba7de74b8dcfd89585532fe384db6b51de --- M templates/web_config.yaml.erb 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Ottomata: Verified; Looks good to me, approved diff --git a/templates/web_config.yaml.erb b/templates/web_config.yaml.erb index 78357d2..109d422 100644 --- a/templates/web_config.yaml.erb +++ b/templates/web_config.yaml.erb @@ -10,8 +10,8 @@ GOOGLE_AUTH_PROVIDER_X509_CERT_URL : 'https://www.googleapis.com/oauth2/v1/certs' GOOGLE_AUTH_SCOPE : 'https://www.googleapis.com/auth/userinfo.email' GOOGLE_USERINFO_URI : 'https://www.googleapis.com/oauth2/v1/userinfo' -GOOGLE_REDIRECT_URI : 'http<%= 's' if @ssl_redirect %>://<%= @server_name %><%= @server_port ? ':' + @server_port : '' %>/auth/google' -GOOGLE_JAVASCRIPT_ORIGIN : 'http<%= 's' if @ssl_redirect %>://<%= @server_name %><%= @server_port ? ':' + @server_port : '' %>' +GOOGLE_REDIRECT_URI : 'http<%= 's' if @ssl_redirect %>://<%= @server_name %><%= @server_port and @server_port.to_i != 80 ? ':' + @server_port : '' %>/auth/google' +GOOGLE_JAVASCRIPT_ORIGIN : 'http<%= 's' if @ssl_redirect %>://<%= @server_name %><%= @server_port and @server_port.to_i != 80 ? ':' + @server_port : '' %>' META_MW_BASE_URL : 'https://meta.wikimedia.org/' META_MW_BASE_INDEX : 'w/index.php' @@ -19,9 +19,9 @@ META_MW_AUTH_URI : 'wiki/Special:OAuth/authorize' META_MW_USERINFO_URI : 'w/api.php?action=query&meta=userinfo&format=json' META_MW_IDENTIFY_URI : 'w/index.php?title=Special:OAuth/identify&format=json' -META_MW_REDIRECT_URI : 'http<%= 's' if @ssl_redirect %>://<%= @server_name %><%= @server_port ? ':' + @server_port : '' %>/auth/meta_mw' +META_MW_REDIRECT_URI : 'http<%= 's' if @ssl_redirect %>://<%= @server_name %><%= @server_port and @server_port.to_i != 80 ? ':' + @server_port : '' %>/auth/meta_mw' META_MW_CONSUMER_KEY : '<%= @meta_mw_consumer_key %>' META_MW_CLIENT_SECRET : '<%= @meta_mw_client_secret %>' -SERVER_HOST : 0.0.0.0 +SERVER_HOST : '0.0.0.0' SERVER_PORT : <%= @server_port %> -- To view, visit https://gerrit.wikimedia.org/r/109714 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4faf39ba7de74b8dcfd89585532fe384db6b51de Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet/wikimetrics Gerrit-Branch: master Gerrit-Owner: Ottomata <o...@wikimedia.org> Gerrit-Reviewer: Ottomata <o...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
