William Grant has proposed merging lp:~wgrant/launchpad/openid-provider-root-cleanup into lp:launchpad with lp:~wgrant/launchpad/openid-provider-root as a prerequisite.
Commit message: Drop the obsolete vhost.openid and vhost.ubuntu_openid config sections. Requested reviews: Launchpad code reviewers (launchpad-reviewers) For more details, see: https://code.launchpad.net/~wgrant/launchpad/openid-provider-root-cleanup/+merge/201555 Our OpenID provider hasn't been a Launchpad vhost for nearly four years now, but the vhost.openid and vhost.ubuntu_openid config sections still determine the provider that we authenticate against. This branch removes the obsolete config options. -- https://code.launchpad.net/~wgrant/launchpad/openid-provider-root-cleanup/+merge/201555 Your team Launchpad code reviewers is requested to review the proposed merge of lp:~wgrant/launchpad/openid-provider-root-cleanup into lp:launchpad.
=== modified file 'configs/development/launchpad-lazr.conf' --- configs/development/launchpad-lazr.conf 2014-01-14 09:04:33 +0000 +++ configs/development/launchpad-lazr.conf 2014-01-14 09:04:44 +0000 @@ -90,7 +90,6 @@ [launchpad] enable_test_openid_provider: True -openid_provider_vhost: testopenid openid_provider_root: https://testopenid.dev/ code_domain: code.launchpad.dev default_batch_size: 5 @@ -226,15 +225,9 @@ [vhost.answers] hostname: answers.launchpad.dev -[vhost.openid] -hostname: openid.launchpad.dev - [vhost.testopenid] hostname: testopenid.dev -[vhost.ubuntu_openid] -hostname: ubuntu-openid.launchpad.dev - [vhost.xmlrpc] hostname: xmlrpc.launchpad.dev rooturl: http://launchpad.dev/ === modified file 'configs/testrunner-appserver/launchpad-lazr.conf' --- configs/testrunner-appserver/launchpad-lazr.conf 2014-01-14 09:04:33 +0000 +++ configs/testrunner-appserver/launchpad-lazr.conf 2014-01-14 09:04:44 +0000 @@ -43,9 +43,6 @@ [vhost.answers] rooturl: http://answers.launchpad.dev:8085/ -[vhost.openid] -rooturl: http://openid.launchpad.dev:8085/ - [vhost.testopenid] rooturl: http://testopenid.dev:8085/ === modified file 'lib/lp/services/config/schema-lazr.conf' --- lib/lp/services/config/schema-lazr.conf 2014-01-14 09:04:33 +0000 +++ lib/lp/services/config/schema-lazr.conf 2014-01-14 09:04:44 +0000 @@ -812,11 +812,6 @@ # datatype: boolean launch: True -# The vhost used as the OpenID provider to log into Launchpad. -# datatype: string -# vhost is being replaced with a direct URL. -openid_provider_vhost: openid - # URL to the OpenID provider to authenticate against. openid_provider_root: none @@ -1663,12 +1658,8 @@ [vhost.answers] -[vhost.openid] - [vhost.testopenid] -[vhost.ubuntu_openid] - [vhost.xmlrpc] [vhost.xmlrpc_private.optional] === modified file 'lib/lp/services/webapp/doc/webapp-publication.txt' --- lib/lp/services/webapp/doc/webapp-publication.txt 2013-06-20 05:50:00 +0000 +++ lib/lp/services/webapp/doc/webapp-publication.txt 2014-01-14 09:04:44 +0000 @@ -63,10 +63,6 @@ rooturl: http://launchpad.dev/ althosts: localhost ---- - openid @ openid.launchpad.dev - rooturl: http://openid.launchpad.dev/ - althosts: - ---- testopenid @ testopenid.dev rooturl: http://testopenid.dev/ althosts: @@ -75,10 +71,6 @@ rooturl: http://translations.launchpad.dev/ althosts: ---- - ubuntu_openid @ ubuntu-openid.launchpad.dev - rooturl: http://ubuntu-openid.launchpad.dev/ - althosts: - ---- xmlrpc @ xmlrpc.launchpad.dev rooturl: http://launchpad.dev/ althosts:
_______________________________________________ Mailing list: https://launchpad.net/~launchpad-reviewers Post to : [email protected] Unsubscribe : https://launchpad.net/~launchpad-reviewers More help : https://help.launchpad.net/ListHelp
