launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/launchpad/remove-geonames-identity into lp:launchpad.

Commit message:
Remove unused google.maps_api_key and launchpad.geonames_identity configuration keys.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/remove-geonames-identity/+merge/330355

I removed these from lp-production-configs a while ago (https://code.launchpad.net/~cjwatson/lp-production-configs/remove-geonames-identity/+merge/324537).
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/remove-geonames-identity into lp:launchpad.

=== modified file 'configs/development/launchpad-lazr.conf'
--- configs/development/launchpad-lazr.conf	2016-10-12 13:35:48 +0000
+++ configs/development/launchpad-lazr.conf	2017-09-07 13:19:12 +0000
@@ -83,7 +83,6 @@
 # Development and the testrunner should use the stub service be default.
 site: http://launchpad.dev:8092/cse
 client_id: ABCDEF2323
-maps_api_key: ABQIAAAAd8GIgO6pcskVE20WMo0tMRTWrrsyo_91eNrAe8_Mod2l0UnqlRSKiPprMSOGPJIjYKODQzeFQPz5Dg
 
 [google_test_service]
 launch: True
@@ -107,7 +106,6 @@
 max_bug_feed_cache_minutes: 30
 bzr_imports_root_url: file:///tmp/bazaar-branches
 geoip_database: /usr/share/GeoIP/GeoLiteCity.dat
-geonames_identity: lpdev
 feature_flags_endpoint: http://xmlrpc-private.launchpad.dev:8087/featureflags/
 
 [launchpad_session]

=== modified file 'lib/lp/services/config/schema-lazr.conf'
--- lib/lp/services/config/schema-lazr.conf	2017-06-29 05:45:36 +0000
+++ lib/lp/services/config/schema-lazr.conf	2017-09-07 13:19:12 +0000
@@ -796,6 +796,7 @@
 # Example: help.launchpad.net login.launchapd.net
 url_rewrite_exceptions: help.launchpad.net
 
+<<<<<<< TREE
 # maps_api_key is the API key we use for Google Maps. Values for the API
 # keys are documented in lib/canonical/launchpad/google.txt
 # The default value is the key for the launchpad.net domain, so we only
@@ -803,6 +804,15 @@
 # datatype: string
 maps_api_key:
 
+=======
+# The following section has been deprecated, and will be removed once it's been
+# removed from production instances.
+[gpgservice]
+# The URL of the gpgservice API endpoint.
+# datatype: string
+api_endpoint: http://gpgservice.invalid/
+
+>>>>>>> MERGE-SOURCE
 [gpghandler]
 # Should we allow uploading keys to the keyserver?
 # datatype: boolean
@@ -1070,10 +1080,6 @@
 # The database used by our GeoIP library.
 geoip_database: /usr/share/GeoIP/GeoIPCity.dat
 
-# The identity used to do remote geo to time zone lookups at
-# ba-ws.geonames.net.
-geonames_identity:
-
 # The maximum number of lines that should be parsed by the launchpad
 # log parser. The default value of None means there is no maximum.
 logparser_max_parsed_lines: None